diff --git a/build3/premake4.lua b/build3/premake4.lua
index 569aeda48..b09f3be50 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -1,11 +1,11 @@
 
-  solution "0_Bullet3Solution"
+	solution "0_Bullet3Solution"
 
 	local osversion = os.getversion()
-		print(string.format(" %d.%d.%d (%s)", 
+	print(string.format(" %d.%d.%d (%s)",
    		osversion.majorversion, osversion.minorversion, osversion.revision,
    		osversion.description))
-	
+
 
 	-- Multithreaded compiling
 	if _ACTION == "vs2010" or _ACTION=="vs2008" then
@@ -14,26 +14,26 @@
 
 	act = ""
 
-    if _ACTION then
-        act = _ACTION
-    end
+	if _ACTION then
+		act = _ACTION
+	end
 
-	  newoption {
-    		trigger     = "ios",
-    		description = "Enable iOS target (requires xcode4)"
+	newoption {
+		trigger     = "ios",
+		description = "Enable iOS target (requires xcode4)"
 	}
 
 	newoption
-        {
-                trigger = "force_dlopen_opengl",
-                description = "Dynamically load OpenGL (instead of static/dynamic linking)"
-        }
+	{
+		trigger = "force_dlopen_opengl",
+		description = "Dynamically load OpenGL (instead of static/dynamic linking)"
+	}
 
 	newoption
-        {
-                trigger = "force_dlopen_x11",
-                description = "Dynamically load OpenGL (instead of static/dynamic linking)"
-        }
+	{
+		trigger = "force_dlopen_x11",
+		description = "Dynamically load OpenGL (instead of static/dynamic linking)"
+	}
 
 	newoption
 	{
@@ -51,8 +51,14 @@
 
 	newoption
 	{
-		trigger = "bullet2demos",
-		description = "Compile the Bullet 2 demos (Demo/Extra folder)"
+		trigger = "no-demos",
+		description = "Don't build demos"
+	}
+
+	newoption
+	{
+		trigger = "no-extras",
+		description = "Don't build Extras"
 	}
 
 	newoption
@@ -60,32 +66,44 @@
 		trigger = "enet",
 		description = "Enable enet NAT punchthrough test"
 	}
+
 	newoption
 	{
 		trigger = "lua",
 		description = "Enable Lua scipting support in Example Browser"
 	}
 
-	 newoption {
-    trigger     = "targetdir",
-    value       = "path such as ../bin",
-    description = "Set the output location for the generated project files"
-  }
-	
-	
+	newoption {
+		trigger     = "targetdir",
+		value       = "path such as ../bin",
+		description = "Set the output location for the generated project files"
+	}
+
 	newoption
 	{
-		trigger = "without-gtest",
+		trigger = "no-test",
+		description = "Disable all tests"
+	}
+
+	newoption
+	{
+		trigger = "no-gtest",
 		description = "Disable unit tests using gtest"
 	}
 
+	newoption
+	{
+		trigger = "no-bullet3",
+		description = "Do not build bullet3 libs"
+	}
+
 	configurations {"Release", "Debug"}
 	configuration "Release"
 		flags { "Optimize", "EnableSSE2","StaticRuntime", "NoMinimalRebuild", "FloatFast"}
 	configuration "Debug"
 		defines {"_DEBUG=1"}
 		flags { "Symbols", "StaticRuntime" , "NoMinimalRebuild", "NoEditAndContinue" ,"FloatFast"}
-	
+
 	if os.is("Linux") or os.is("macosx") then
 		if os.is64bit() then
 			platforms {"x64"}
@@ -112,25 +130,28 @@
 	postfix=""
 
 	if _ACTION == "xcode4" then
-			 if _OPTIONS["ios"] then
-                        postfix = "ios";
-                        xcodebuildsettings
-                        {
-                                'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
-                                'CODE_SIGN_IDENTITY = "iPhone Developer"',
-                                "SDKROOT = iphoneos",
-                                'ARCHS = "armv7"',
-                                'TARGETED_DEVICE_FAMILY = "1,2"',
-                                'VALID_ARCHS = "armv7"',
-                        }       
-			else
+		if _OPTIONS["ios"] then
+			_OPTIONS["no-bullet3"] = "1"
+			_OPTIONS["no-gtest"] = "1"
+
+			postfix = "ios";
 			xcodebuildsettings
 			{
-        		'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
-        		'VALID_ARCHS = "x86_64 i386"',
+				'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
+				'CODE_SIGN_IDENTITY = "iPhone Developer"',
+				"SDKROOT = iphoneos",
+				'ARCHS = "armv7"',
+				'TARGETED_DEVICE_FAMILY = "1,2"',
+				'VALID_ARCHS = "armv7"',
+			}
+		else
+			xcodebuildsettings
+			{
+				'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
+				'VALID_ARCHS = "x86_64 i386"',
 --			'SDKROOT = "macosx10.9"',
 			}
-			end
+		end
 	end
 
 -- comment-out for now, URDF reader needs exceptions
@@ -148,57 +169,80 @@
 	dofile ("findOpenCL.lua")
 	dofile ("findDirectX11.lua")
 	dofile ("findOpenGLGlewGlut.lua")
-	
+
 	if (not findOpenGL3()) then
 		defines {"NO_OPENGL3"}
 	end
 
 	language "C++"
 
-if not _OPTIONS["ios"] then
-
-	include "../examples/ExampleBrowser"
-	include "../examples/OpenGLWindow"
-	include "../examples/SharedMemory"
-	include "../examples/MultiThreading"
-	include "../examples/ThirdPartyLibs/Gwen"
-	include "../Extras"
-
-	include "../examples/HelloWorld"
-	include "../examples/BasicDemo"
-	include "../test/SharedMemory"
-	
-	if _OPTIONS["enet"] then
-		include "../examples/ThirdPartyLibs/enet"
-		include "../test/enet/client"
-		include "../test/enet/server"	
+	if _OPTIONS["no-bullet3"] then
+		print "--no-bullet3 implies --no-demos"
+		_OPTIONS["no-demos"] = "1"
+	else
+		include "../src/Bullet3Common"
+		include "../src/Bullet3Geometry"
+		include "../src/Bullet3Collision"
+		include "../src/Bullet3Dynamics"
+		include "../src/Bullet3OpenCL"
+		include "../src/Bullet3Serialize/Bullet2FileLoader"
 	end
 
-	if _OPTIONS["lua"] then
-		include "../examples/ThirdPartyLibs/lua-5.2.3"
+	if _OPTIONS["no-extras"] then
+		print "--no-extras implies --no-demos"
+		_OPTIONS["no-demos"] = "1"
+	else
+		include "../Extras"
 	end
-	
-	include "../src/Bullet3Common"
-	include "../src/Bullet3Geometry"
-	include "../src/Bullet3Collision"
-	include "../src/Bullet3Dynamics"
-	include "../src/Bullet3OpenCL"
-	include "../src/Bullet3Serialize/Bullet2FileLoader"
 
- 	if not _OPTIONS["without-gtest"] then
-                include "../test/gtest-1.7.0"
---              include "../test/hello_gtest"
-                include "../test/collision"
-		include "../test/InverseDynamics"
-                include "../test/TestBullet3OpenCL"
-                include "../test/GwenOpenGLTest"
-        end
-end
+	if not _OPTIONS["no-demos"] then
+		include "../examples/ExampleBrowser"
+		include "../examples/OpenGLWindow"
+		include "../examples/ThirdPartyLibs/Gwen"
+
+		include "../examples/HelloWorld"
+		include "../examples/BasicDemo"
+
+		include "../examples/SharedMemory"
+		include "../examples/MultiThreading"
+
+		if _OPTIONS["lua"] then
+		   include "../examples/ThirdPartyLibs/lua-5.2.3"
+		end
+
+		if not _OPTIONS["no-test"] then
+			include "../test/SharedMemory"
+			if _OPTIONS["enet"] then
+				include "../examples/ThirdPartyLibs/enet"
+				include "../test/enet/client"
+				include "../test/enet/server"
+			end
+		end
+	end
+
+	if not _OPTIONS["no-test"] then
+		include "../test/Bullet2"
+
+		if not _OPTIONS["no-gtest"] then
+			include "../test/gtest-1.7.0"
+--			include "../test/hello_gtest"
+			include "../test/collision"
+			if not _OPTIONS["no-bullet3"] then
+				if not _OPTIONS["no-extras"] then
+					include "../test/InverseDynamics"
+				end
+				include "../test/TestBullet3OpenCL"
+			end
+			if not _OPTIONS["no-demos"] then
+				-- Gwen is only used for demos
+				include "../test/GwenOpenGLTest"
+			end
+		end
+	end
 
-	include "../test/Bullet2"
 	include "../src/BulletInverseDynamics"
  	include "../src/BulletSoftBody"
-        include "../src/BulletDynamics"
-        include "../src/BulletCollision"
-        include "../src/LinearMath"
-	
+	include "../src/BulletDynamics"
+	include "../src/BulletCollision"
+	include "../src/LinearMath"
+