Merge remote-tracking branch 'bp/master'

Conflicts:
	examples/ExampleBrowser/CMakeLists.txt
	examples/OpenGLWindow/CMakeLists.txt

CMakeLists.txt

@@ -279,7 +279,9 @@ ENDIF()
 
 set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
 list (APPEND BULLET_LIBRARIES LinearMath)
-list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
+IF(BUILD_BULLET3)
+    list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
+ENDIF(BUILD_BULLET3)
 list (APPEND BULLET_LIBRARIES BulletCollision)
 list (APPEND BULLET_LIBRARIES BulletDynamics)
 list (APPEND BULLET_LIBRARIES BulletSoftBody)

Extras/CMakeLists.txt

@@ -1,4 +1,8 @@
-SUBDIRS( Serialize InverseDynamics ConvexDecomposition HACD GIMPACTUtils )
+SUBDIRS( Serialize ConvexDecomposition HACD GIMPACTUtils )
+
+IF(BUILD_BULLET3)
+	SUBDIRS( InverseDynamics)
+ENDIF()
 
 #Maya Dynamica plugin is moved to http://dynamica.googlecode.com
 

Extras/Serialize/BulletFileLoader/CMakeLists.txt

@@ -35,9 +35,10 @@ IF (INSTALL_EXTRA_LIBS)
 				INSTALL(TARGETS BulletFileLoader DESTINATION .)
 			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX})
-                                INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+				INSTALL(
-DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+					DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+					DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+					".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
 			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 

build3/premake4.lua

@@ -51,8 +51,14 @@
 
 	newoption
 	{
-		trigger = "bullet2demos",
+		trigger = "no-demos",
-		description = "Compile the Bullet 2 demos (Demo/Extra folder)"
+		description = "Don't build demos"
+	}
+
+	newoption
+	{
+		trigger = "no-extras",
+		description = "Don't build Extras"
 	}
 
 	newoption
@@ -60,6 +66,7 @@
 		trigger = "enet",
 		description = "Enable enet NAT punchthrough test"
 	}
+
 	newoption
 	{
 		trigger = "lua",
@@ -72,13 +79,24 @@
 		description = "Set the output location for the generated project files"
 	}
 
+	newoption
+	{
+		trigger = "no-test",
+		description = "Disable all tests"
+	}
 
 	newoption
 	{
-		trigger = "without-gtest",
+		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"}
@@ -113,6 +131,9 @@
 
 	if _ACTION == "xcode4" then
 		if _OPTIONS["ios"] then
+			_OPTIONS["no-bullet3"] = "1"
+			_OPTIONS["no-gtest"] = "1"
+
 			postfix = "ios";
 			xcodebuildsettings
 			{
@@ -155,47 +176,70 @@
 
 	language "C++"
 
-if not _OPTIONS["ios"] then
+	if _OPTIONS["no-bullet3"] then
-
+		print "--no-bullet3 implies --no-demos"
-	include "../examples/ExampleBrowser"
+		_OPTIONS["no-demos"] = "1"
-	include "../examples/OpenGLWindow"
+	else
-	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"	
-	end
-
-	if _OPTIONS["lua"] then
-		include "../examples/ThirdPartyLibs/lua-5.2.3"
-	end
-	
 		include "../src/Bullet3Common"
 		include "../src/Bullet3Geometry"
 		include "../src/Bullet3Collision"
 		include "../src/Bullet3Dynamics"
 		include "../src/Bullet3OpenCL"
 		include "../src/Bullet3Serialize/Bullet2FileLoader"
+	end
 
- 	if not _OPTIONS["without-gtest"] then
+	if _OPTIONS["no-extras"] then
+		print "--no-extras implies --no-demos"
+		_OPTIONS["no-demos"] = "1"
+	else
+		include "../Extras"
+	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
+	end
 
-	include "../test/Bullet2"
 	include "../src/BulletInverseDynamics"
  	include "../src/BulletSoftBody"
 	include "../src/BulletDynamics"

examples/ExampleBrowser/CMakeLists.txt

@@ -214,9 +214,7 @@ ELSE(WIN32)
 		ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
 		ADD_DEFINITIONS("-DGLEW_STATIC")
 		ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
-		INCLUDE_DIRECTORIES(
+		INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
-                                ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
-	        )
 		LINK_LIBRARIES( pthread dl)
 	ENDIF(APPLE)
 ENDIF(WIN32)

examples/SimpleOpenGL3/CMakeLists.txt

@@ -3,6 +3,8 @@
 INCLUDE_DIRECTORIES(
 	${BULLET_PHYSICS_SOURCE_DIR}/src
 	${BULLET_PHYSICS_SOURCE_DIR}/btgui
+	${BULLET_PHYSICS_SOURCE_DIR}/examples
+	${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
 )
 
 
@@ -26,8 +28,8 @@ ELSE(WIN32)
 		find_library(COCOA NAMES Cocoa)
 		MESSAGE(${COCOA})
 		link_libraries(${COCOA})
-	ELSE(APPLE)
 
+	ELSE(APPLE)
 		INCLUDE_DIRECTORIES(
 			${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
 		)

src/CMakeLists.txt

@@ -1,9 +1,10 @@
 
 IF(BUILD_BULLET3)
 	SUBDIRS(  Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common )
+	SUBDIRS(  BulletInverseDynamics  )
 ENDIF(BUILD_BULLET3)
 
-SUBDIRS(  BulletSoftBody BulletInverseDynamics BulletCollision BulletDynamics LinearMath )
+SUBDIRS(  BulletSoftBody BulletCollision BulletDynamics LinearMath )
 
 
 IF(INSTALL_LIBS)

test/CMakeLists.txt

@@ -1,3 +1,7 @@
-#SUBDIRS(  gtest-1.7.0  TestBullet3OpenCL)
+IF(BUILD_BULLET3)
-SUBDIRS(  gtest-1.7.0  collision InverseDynamics)
+	#SUBDIRS( TestBullet3OpenCL )
+	SUBDIRS(  InverseDynamics )
+ENDIF(BUILD_BULLET3)
+
+SUBDIRS(  gtest-1.7.0  collision )