Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more build system changes, to reflect Gimpact/BulletMultiThreaded move from Extras to src

Browse Source
This commit is contained in:
erwin.coumans
2008-10-11 05:52:45 +00:00
parent 22a79e61b1
commit e4ed38e7f6
5 changed files with 78 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/AllBulletDemos/Makefile.am
View File

@@ -24,7 +24,6 @@ AllBulletDemo_SOURCES=\
Main.cpp
AllBulletDemo_CXXFLAGS=\
-I@top_builddir@/src \
-I@top_builddir@/Extras/GIMPACT/include \
-I@top_builddir@/Extras/GIMPACTUtils \
-I@top_builddir@/Extras/ConvexDecomposition \
-I@top_builddir@/Extras \
@@ -32,4 +31,4 @@ AllBulletDemo_CXXFLAGS=\
-I@top_builddir@/Demos/SoftDemo \
-I@top_builddir@/Demos/Benchmarks \
$(CXXFLAGS)
AllBulletDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -L../../Extras -lgimpact -lgimpactutils -lconvexdecomposition -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath -lglui @opengl_LIBS@
AllBulletDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -L../../Extras -lgimpactutils -lconvexdecomposition -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath -lglui @opengl_LIBS@

2
Demos/MultiThreadedDemo/Makefile.am
View File

@@ -1,5 +1,5 @@
noinst_PROGRAMS=MultiThreadedDemo
MultiThreadedDemo_SOURCES=MultiThreadedDemo.cpp MultiThreadedDemo.h main.cpp
MultiThreadedDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL -I@top_builddir@/Extras -I@top_builddir@/Extras/BulletMultiThreaded $(CXXFLAGS)
MultiThreadedDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL -I@top_builddir@/Extras $(CXXFLAGS)
MultiThreadedDemo_LDADD=-L../OpenGL -L../../Extras -L../../src -lbulletmultithreaded -lbulletopenglsupport -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@ -lpthread