fix premake4 build

4 files changed, 47 insertions, 6 deletions

diff --git a/build3/premake4.lua b/build3/premake4.lua
index 8a6de1938..73dbd8965 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -66,7 +66,27 @@
 		trigger = "enable_static_vr_plugin",
 		description = "Statically link vr plugin (in examples/SharedMemory/plugins/vrSyncPlugin)"
 	}
-	
+         newoption
+        {
+                trigger = "enable_static_test_plugin",
+                description = "Statically link test plugin (in examples/SharedMemory/plugins/testPlugin)"
+        }
+         newoption
+        {
+                trigger = "enable_static_tiny_renderer__plugin",
+                description = "Statically link vr plugin (in examples/SharedMemory/plugins/tinyRendererPlugin)"
+        }
+         newoption
+        {
+                trigger = "enable_static_pd_control_plugin",
+                description = "Statically link vr plugin (in examples/SharedMemory/plugins/pdControlPlugin)"
+        }
+         newoption
+        {
+                trigger = "enable_static_collision_filter_plugin",
+                description = "Statically link vr plugin (in examples/SharedMemory/plugins/collisionFilterPlugin)"
+        }
+ 
 	newoption
 	{
 		trigger = "enable_physx",
@@ -319,6 +339,12 @@ end
 		trigger = "no-test",
 		description = "Disable all tests"
 	}
+	newoption
+        {       
+                trigger = "test-bullet2",
+
+                description = "Enable Bullet2 LinearMath test"
+        }
 
 	newoption
 	{
@@ -646,7 +672,9 @@ end
         end
 
 	if not _OPTIONS["no-test"] then
+                if _OPTIONS["test-bullet2"] then
 		include "../test/Bullet2"
+		end
 
 		if not _OPTIONS["no-gtest"] then
 			include "../test/gtest-1.7.0"
diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua
index e28676350..6cceceb4d 100644
--- a/examples/ExampleBrowser/premake4.lua
+++ b/examples/ExampleBrowser/premake4.lua
@@ -182,6 +182,7 @@ project "App_BulletExampleBrowser"
 		"../VoronoiFracture/*",
 		"../SoftDemo/*",
 		"../DeformableDemo/*",
+                "../ReducedDeformableDemo/*",
 		"../RollingFrictionDemo/*",
 		"../rbdl/*",
 		"../FractureDemo/*",
diff --git a/examples/SharedMemory/premake4.lua b/examples/SharedMemory/premake4.lua
index 980f14063..23ceb4887 100644
--- a/examples/SharedMemory/premake4.lua
+++ b/examples/SharedMemory/premake4.lua
@@ -123,7 +123,7 @@ if (_OPTIONS["enable_static_vr_plugin"]) then
 	files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
 end
 
-if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
+if (_OPTIONS["enable_static_tinyrenderer_plugin"]) then
 	files 
 		{
 		"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@@ -222,7 +222,7 @@ language "C++"
 		
 	end
 
-if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
+if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
 	files 
 		{
 		"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@@ -381,7 +381,7 @@ if os.is("Windows") then
 		initOpenGL()
 	  initGlew()
 	
-	if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
+	if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
 	files 
 		{
 		"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@@ -477,13 +477,24 @@ end
 include "udp"
 include "tcp"
 
+if (_OPTIONS["enable_static_test_plugin"]) then
 include "plugins/testPlugin"
+end
+
+if (_OPTIONS["enable_vr_sync_plugin"]) then
 include "plugins/vrSyncPlugin"
-include "plugins/tinyRendererPlugin"
+end
 
+if (_OPTIONS["enable_static_tiny_renderer__plugin"]) then
+include "plugins/tinyRendererPlugin"
+end
+if (_OPTIONS["enable_static_pd_control_plugin"]) then
 include "plugins/pdControlPlugin"
-include "plugins/collisionFilterPlugin"
+end
 
+if (_OPTIONS["enable_static_collision_filter_plugin"]) then
+include "plugins/collisionFilterPlugin"
+end
 if _OPTIONS["enable_egl"] then
 		include "plugins/eglPlugin"
 end
diff --git a/src/BulletSoftBody/premake4.lua b/src/BulletSoftBody/premake4.lua
index c8a6e5151..370bd98c1 100644
--- a/src/BulletSoftBody/premake4.lua
+++ b/src/BulletSoftBody/premake4.lua
@@ -10,5 +10,6 @@
     end
 	files {
 		"**.cpp",
+                "BulletReducedDeformableBody/**.cpp",
 		"**.h"
 	}