Allow to build without Bullet Physics.

build.config

@@ -3,6 +3,7 @@
   <PropertyGroup Label="Configuration">
 
     <!-- yes/no values -->
+    <enable_bullet>yes</enable_bullet>
     <enable_ffmpeg>yes</enable_ffmpeg>
     <enable_gl>yes</enable_gl>
     <enable_sdl>yes</enable_sdl>

build/autotools/m4/lol-conf.m4

@@ -81,6 +81,15 @@ if test "$ac_cv_have_getopt_long" != "no"; then
 fi
 
 
+dnl  Use Bullet Physics?
+ac_cv_my_have_bullet="no"
+if test "${enable_bullet}" != "no"; then
+  ac_cv_my_have_bullet="yes"
+  AC_DEFINE(LOL_USE_BULLET, 1, Define to 1 to use Bullet Physics)
+fi
+AM_CONDITIONAL(LOL_USE_BULLET, test "${ac_cv_my_have_bullet}" = "yes")
+
+
 dnl  Use NativeClient?
 ac_cv_my_have_nacl="no"
 AC_LANG_PUSH(C++)

configure.ac

@@ -90,6 +90,8 @@ AC_ARG_ENABLE(imlib2,
   [  --enable-imlib2         build using Imlib2 (default autodetected)])
 AC_ARG_ENABLE(png,
   [  --enable-png            build using libpng (default autodetected)])
+AC_ARG_ENABLE(bullet,
+  [  --enable-bullet         build using Bullet Physics (default yes)])
 
 AC_ARG_ENABLE(test,
   [  --enable-test           build test suite (default yes)])

doc/samples/Makefile.am

@@ -9,7 +9,10 @@ bench: benchsuite$(EXEEXT)
 if BUILD_SAMPLES
 noinst_PROGRAMS = bluenoise benchsuite simplex
 if LOL_USE_GL
-noinst_PROGRAMS += btphystest nacl_phystest
+noinst_PROGRAMS += nacl_phystest
+if LOL_USE_BULLET
+noinst_PROGRAMS += btphystest
+endif
 endif
 endif
 

doc/samples/benchsuite.vcxproj

@@ -41,7 +41,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/samples/btphystest.vcxproj

@@ -51,7 +51,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/samples/meshviewer/meshviewer.vcxproj

@@ -38,7 +38,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">

doc/samples/nacl_phystest.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/01_triangle.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/02_cube.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/03_noise.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/04_texture.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/05_easymesh.vcxproj

@@ -37,7 +37,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">

doc/tutorial/06_sprite.vcxproj

@@ -37,7 +37,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/07_input.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/08_fbo.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/11_fractal.vcxproj

@@ -40,7 +40,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/12_voronoi.vcxproj

@@ -44,7 +44,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/13_shader_builder.vcxproj

@@ -34,7 +34,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

doc/tutorial/14_lol_lua.vcxproj

@@ -34,7 +34,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">

doc/tutorial/15_lolimgui.vcxproj

@@ -34,7 +34,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/3rdparty/Makefile.am

@@ -1,7 +1,10 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-noinst_LIBRARIES = liblol-bullet.a liblol-lua.a
+noinst_LIBRARIES = liblol-lua.a
+if LOL_USE_BULLET
+noinst_LIBRARIES += liblol-bullet.a
+endif
 
 # Only remove flags that were actually set, because we don't know
 # what the compiler actually accepts.

src/Makefile.am

@@ -26,8 +26,10 @@ liblol_core_a_SOURCES = \
     $(sdl_sources) \
     $(d3d9_sources) \
     $(android_sources)
-#liblol_core_a_CPPFLAGS = -include-pch $(srcdir)/lol/engine-internal.h.pch $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/bullet3/src -I$(srcdir)/3rdparty/lua/src
-liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/bullet3/src -I$(srcdir)/3rdparty/lua/src
+liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src
+if LOL_USE_BULLET
+liblol_core_a_CPPFLAGS += -I$(srcdir)/3rdparty/bullet3/src
+endif
 
 liblol_core_headers = \
     lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h lol/legacy.h \

src/lol-core.vcxproj

@@ -396,7 +396,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/t/test-base.vcxproj

@@ -42,7 +42,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/t/test-entity.vcxproj

@@ -38,7 +38,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/t/test-image.vcxproj

@@ -39,7 +39,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/t/test-math.vcxproj

@@ -55,7 +55,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>

src/t/test-sys.vcxproj

@@ -38,7 +38,7 @@
     <ProjectReference Include="$(LolDir)\src\lol-core.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
+    <ProjectReference Condition="'$(enable_bullet)'!='no'" Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
   </ItemGroup>