diff --git a/Demos/AllBulletDemos/Makefile.am b/Demos/AllBulletDemos/Makefile.am new file mode 100644 index 000000000..884b7fd83 --- /dev/null +++ b/Demos/AllBulletDemos/Makefile.am @@ -0,0 +1,35 @@ +noinst_PROGRAMS=AllBulletDemo + +AllBulletDemo_SOURCES=\ + ../SoftDemo/SoftDemo.cpp \ + ../Benchmarks/BenchmarkDemo.cpp \ + ../VehicleDemo/VehicleDemo.cpp \ + ../RagdollDemo/RagdollDemo.cpp \ + ../BasicDemo/BasicDemo.cpp \ + ../CcdPhysicsDemo/CcdPhysicsDemo.cpp \ + ../SliderConstraintDemo/SliderConstraintDemo.cpp \ + ../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp \ + ../Raytracer/Raytracer.cpp \ + ../BspDemo/BspDemo.cpp \ + ../BspDemo/BspLoader.cpp \ + ../BspDemo/BspConverter.cpp \ + ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp \ + ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp \ + ../GimpactTestDemo/GimpactTestDemo.cpp \ + ../GjkConvexCastDemo/LinearConvexCastDemo.cpp \ + ../ConcaveDemo/ConcavePhysicsDemo.cpp \ + ../DynamicControlDemo/MotorDemo.cpp \ + DemoEntries.cpp \ + DemoEntries.h\ + 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 \ + -I@top_builddir@/Demos/OpenGL \ + -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@ diff --git a/Demos/BasicDemo/Makefile.am b/Demos/BasicDemo/Makefile.am index 77bfe4b13..71a2a2845 100644 --- a/Demos/BasicDemo/Makefile.am +++ b/Demos/BasicDemo/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=BasicDemo +noinst_PROGRAMS=BasicDemo BasicDemo_SOURCES=BasicDemo.cpp BasicDemo.h main.cpp BasicDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS) diff --git a/Demos/CcdPhysicsDemo/Makefile.am b/Demos/CcdPhysicsDemo/Makefile.am index 9bd23e79a..506dfa3fc 100644 --- a/Demos/CcdPhysicsDemo/Makefile.am +++ b/Demos/CcdPhysicsDemo/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=CcdPhysicsDemo +noinst_PROGRAMS=CcdPhysicsDemo CcdPhysicsDemo_SOURCES=CcdPhysicsDemo.cpp CcdPhysicsDemo.h main.cpp CcdPhysicsDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS) diff --git a/Demos/ColladaDemo/Makefile.am b/Demos/ColladaDemo/Makefile.am index 26b391728..ef881183f 100644 --- a/Demos/ColladaDemo/Makefile.am +++ b/Demos/ColladaDemo/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=ColladaDemo +noinst_PROGRAMS=ColladaDemo ColladaDemo_SOURCES=ColladaDemo.cpp ColladaDemo.h ColladaDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL -I@top_builddir@/Extras -I@top_builddir@/Extras/BulletColladaConverter $(CXXFLAGS) diff --git a/Demos/MultiThreadedDemo/Makefile.am b/Demos/MultiThreadedDemo/Makefile.am index b263aa199..f1411d453 100644 --- a/Demos/MultiThreadedDemo/Makefile.am +++ b/Demos/MultiThreadedDemo/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=MultiThreadedDemo +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) diff --git a/Demos/SoftDemo/Makefile.am b/Demos/SoftDemo/Makefile.am new file mode 100644 index 000000000..a17afb82d --- /dev/null +++ b/Demos/SoftDemo/Makefile.am @@ -0,0 +1,5 @@ +noinst_PROGRAMS=SoftDemo + +SoftDemo_SOURCES=SoftDemo.cpp SoftDemo.h main.cpp +SoftDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS) +SoftDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lbulletsoftbody -lbulletdynamics -lbulletcollision -lbulletmath @opengl_LIBS@ diff --git a/Demos/VehicleDemo/Makefile.am b/Demos/VehicleDemo/Makefile.am index 8bf5ad7de..7dbab8b1d 100644 --- a/Demos/VehicleDemo/Makefile.am +++ b/Demos/VehicleDemo/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS=VehicleDemo +noinst_PROGRAMS=VehicleDemo VehicleDemo_SOURCES=VehicleDemo.cpp VehicleDemo.h main.cpp VehicleDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS) diff --git a/Extras/Makefile.am b/Extras/Makefile.am index 8cc23331b..aa8e2ce4e 100644 --- a/Extras/Makefile.am +++ b/Extras/Makefile.am @@ -1,5 +1,94 @@ -noinst_LIBRARIES = libxml.a libbulletcolladaconverter.a libcollada_dom.a libbulletmultithreaded.a +noinst_LIBRARIES = libxml.a libbulletcolladaconverter.a libcollada_dom.a libbulletmultithreaded.a libgimpact.a libgimpactutils.a libconvexdecomposition.a libglui.a +libglui_a_CXXFLAGS = ${CXXFLAGS} -Iglui +libglui_a_SOURCES =\ + glui/glui_spinner.cpp\ + glui/glui_treepanel.cpp\ + glui/arcball.cpp\ + glui/glui_scrollbar.cpp\ + glui/glui_filebrowser.cpp\ + glui/glui_node.cpp\ + glui/glui_edittext.cpp\ + glui/glui_statictext.cpp\ + glui/glui_bitmaps.cpp\ + glui/algebra3.cpp\ + glui/glui_string.cpp\ + glui/glui_button.cpp\ + glui/glui_add_controls.cpp\ + glui/glui_control.cpp\ + glui/glui.cpp\ + glui/glui_listbox.cpp\ + glui/glui_checkbox.cpp\ + glui/glui_commandline.cpp\ + glui/glui_textbox.cpp\ + glui/glui_column.cpp\ + glui/glui_mouse_iaction.cpp\ + glui/glui_radio.cpp\ + glui/glui_translation.cpp\ + glui/glui_tree.cpp\ + glui/glui_rotation.cpp\ + glui/glui_panel.cpp\ + glui/glui_rollout.cpp\ + glui/glui_separator.cpp\ + glui/glui_bitmap_img_data.cpp\ + glui/quaternion.cpp\ + glui/glui_window.cpp\ + glui/glui_list.cpp\ + glui/GL/glui.h\ + glui/quaternion.h\ + glui/glui_internal.h\ + glui/glui_internal_control.h\ + glui/arcball.h\ + glui/algebra3.h + +libconvexdecomposition_a_CXXFLAGS = ${CXXFLAGS} -IConvexDecomposition/ -I../src +libconvexdecomposition_a_SOURCES =\ + ConvexDecomposition/concavity.cpp\ + ConvexDecomposition/ConvexDecomposition.cpp\ + ConvexDecomposition/vlookup.cpp\ + ConvexDecomposition/bestfit.cpp\ + ConvexDecomposition/ConvexBuilder.cpp\ + ConvexDecomposition/cd_hull.cpp\ + ConvexDecomposition/raytri.cpp\ + ConvexDecomposition/splitplane.cpp\ + ConvexDecomposition/float_math.cpp\ + ConvexDecomposition/planetri.cpp\ + ConvexDecomposition/cd_wavefront.cpp\ + ConvexDecomposition/bestfitobb.cpp\ + ConvexDecomposition/meshvolume.cpp\ + ConvexDecomposition/fitsphere.cpp\ + ConvexDecomposition/fitsphere.h\ + ConvexDecomposition/vlookup.h\ + ConvexDecomposition/concavity.h\ + ConvexDecomposition/ConvexDecomposition.h\ + ConvexDecomposition/bestfit.h\ + ConvexDecomposition/cd_vector.h\ + ConvexDecomposition/ConvexBuilder.h\ + ConvexDecomposition/cd_hull.h\ + ConvexDecomposition/raytri.h\ + ConvexDecomposition/splitplane.h\ + ConvexDecomposition/float_math.h\ + ConvexDecomposition/planetri.h\ + ConvexDecomposition/cd_wavefront.h\ + ConvexDecomposition/bestfitobb.h\ + ConvexDecomposition/meshvolume.h + +libgimpactutils_a_CXXFLAGS = ${CXXFLAGS} -IGIMPACT/include -I../src -IGIMPACTUtils -IConvexDecomposition +libgimpactutils_a_SOURCES = GIMPACTUtils/btGImpactConvexDecompositionShape.cpp GIMPACTUtils/btGImpactConvexDecompositionShape.h + +libgimpact_a_CXXFLAGS = ${CXXFLAGS} -IGIMPACT/include -I../src +libgimpact_a_SOURCES =\ + GIMPACT/src/Bullet/btGImpactBvh.cpp\ + GIMPACT/src/Bullet/btGImpactQuantizedBvh.cpp\ + GIMPACT/src/Bullet/btTriangleShapeEx.cpp\ + GIMPACT/src/Bullet/btGImpactCollisionAlgorithm.cpp\ + GIMPACT/src/Bullet/btGImpactShape.cpp\ + GIMPACT/src/core/gim_box_set.cpp\ + GIMPACT/src/core/gim_contact.cpp\ + GIMPACT/src/core/gim_memory.cpp\ + GIMPACT/src/core/gim_tri_collision.cpp + + libbulletmultithreaded_a_CXXFLAGS = $(CXXFLAGS) -I../src -IBulletMultiThreaded libbulletmultithreaded_a_SOURCES =\ BulletMultiThreaded/SpuCollisionObjectWrapper.cpp \ diff --git a/Makefile.am b/Makefile.am index dda1048fb..f4076b2c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS=src Extras Demos/OpenGL Demos/BasicDemo Demos/VehicleDemo Demos/CcdPhysicsDemo Demos/ColladaDemo Demos/MultiThreadedDemo +SUBDIRS=src Extras Demos/OpenGL Demos/BasicDemo Demos/VehicleDemo Demos/CcdPhysicsDemo Demos/ColladaDemo Demos/MultiThreadedDemo Demos/SoftDemo Demos/AllBulletDemos diff --git a/configure.ac b/configure.ac index 36e0646c2..8dde76a08 100644 --- a/configure.ac +++ b/configure.ac @@ -154,7 +154,7 @@ CXXFLAGS="$CXXFLAGS $CFLAGS" # Emit generated files. #---------------------------------------------------------------------------- CS_JAMCONFIG_OUTPUT([Jamconfig]) -AC_CONFIG_FILES([bullet.pc Jamfile Makefile Demos/MultiThreadedDemo/Makefile Demos/ColladaDemo/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile src/Makefile Extras/Makefile]) +AC_CONFIG_FILES([bullet.pc Jamfile Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/ColladaDemo/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile src/Makefile Extras/Makefile]) AC_OUTPUT AC_MSG_NOTICE([