From 35c916f487092310e7be8dd3ea88986138ec7099 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Mon, 24 Mar 2014 13:18:24 -0700
Subject: [PATCH] add CMake support for AppAllBullet2Demos demo. See also
 https://github.com/bulletphysics/bullet3/issues/43

---
 Demos3/AllBullet2Demos/BulletDemoEntries.h |  2 +-
 Demos3/AllBullet2Demos/CMakeLists.txt      | 64 ++++++++++++++++++++++
 Demos3/CMakeLists.txt                      |  2 +-
 btgui/Gwen/CMakeLists.txt                  |  4 +-
 src/BulletDynamics/CMakeLists.txt          |  3 +
 5 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 Demos3/AllBullet2Demos/CMakeLists.txt

diff --git a/Demos3/AllBullet2Demos/BulletDemoEntries.h b/Demos3/AllBullet2Demos/BulletDemoEntries.h
index 2be144815..c603a2785 100644
--- a/Demos3/AllBullet2Demos/BulletDemoEntries.h
+++ b/Demos3/AllBullet2Demos/BulletDemoEntries.h
@@ -40,7 +40,7 @@ static BulletDemoEntry allDemos[]=
 //	{"MultiBody2",FeatherstoneDemo2::MyCreateFunc},
 
 	{"MultiDofDemo",MultiDofDemo::MyCreateFunc},
-	{"LuaDemo",LuaDemo::MyCreateFunc}
+//	{"LuaDemo",LuaDemo::MyCreateFunc}
 
 };
 
diff --git a/Demos3/AllBullet2Demos/CMakeLists.txt b/Demos3/AllBullet2Demos/CMakeLists.txt
new file mode 100644
index 000000000..29cfb6d24
--- /dev/null
+++ b/Demos3/AllBullet2Demos/CMakeLists.txt
@@ -0,0 +1,64 @@
+
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src 
+	${BULLET_PHYSICS_SOURCE_DIR}/btgui
+)
+ 
+ 
+SET(App_AllBullet2Demos_SRCS
+	main.cpp
+	BulletDemoInterface.h
+	BulletDemoEntries.h
+	../bullet2/BasicDemo/Bullet2RigidBodyDemo.cpp
+	../bullet2/BasicDemo/Bullet2RigidBodyDemo.h
+	../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp
+	../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.h
+	../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.cpp
+	../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h
+	../bullet2/BasicDemo/BasicDemo.cpp
+	../bullet2/BasicDemo/BasicDemo.h
+	../bullet2/BasicDemo/HingeDemo.cpp
+	../bullet2/BasicDemo/HingeDemo.h
+	../bullet2/ChainDemo/ChainDemo.cpp
+	../bullet2/ChainDemo/ChainDemo.h
+	../bullet2/RagdollDemo/RagdollDemo.cpp
+	../bullet2/RagdollDemo/RagdollDemo.h
+#	../bullet2/LuaDemo/LuaDemo.cpp
+#	../bullet2/LuaDemo/LuaDemo.h
+	../GpuDemos/gwenUserInterface.cpp
+	../GpuDemos/gwenUserInterface.h
+	../../btgui/Timing/b3Clock.cpp
+	../../btgui/Timing/b3Clock.h
+
+	${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
+)
+
+IF (WIN32)
+	SET(App_AllBullet2Demos_SRCS ${App_AllBullet2Demos_SRCS}  ${App_AllBullet2Demos_Common_SRCS})
+	INCLUDE_DIRECTORIES(
+				${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
+	)
+	ADD_DEFINITIONS(-DGLEW_STATIC)
+ELSE(WIN32)
+	IF(NOT APPLE)
+		LINK_LIBRARIES( GLEW)
+	ENDIF(NOT APPLE)
+ENDIF(WIN32)
+ 
+	
+
+LINK_LIBRARIES(
+	Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+)
+
+ADD_EXECUTABLE(App_AllBullet2Demos
+		${App_AllBullet2Demos_SRCS}
+)
+	
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
\ No newline at end of file
diff --git a/Demos3/CMakeLists.txt b/Demos3/CMakeLists.txt
index bcd6775fb..1efa8ea1f 100644
--- a/Demos3/CMakeLists.txt
+++ b/Demos3/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS(  SimpleOpenGL3 )
+SUBDIRS(  SimpleOpenGL3 AllBullet2Demos )
diff --git a/btgui/Gwen/CMakeLists.txt b/btgui/Gwen/CMakeLists.txt
index c88f8e1b0..4deedbd42 100644
--- a/btgui/Gwen/CMakeLists.txt
+++ b/btgui/Gwen/CMakeLists.txt
@@ -6,8 +6,8 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS( -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB )
 
-FILE(GLOB gwen_SRCS "*.cpp")
-FILE(GLOB gwen_HDRS "*.h")
+FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp")
+FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h")
 
 ADD_LIBRARY(gwen ${gwen_SRCS} ${gwen_HDRS})
 
diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
index a19c0479e..f971a9cf9 100644
--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(BulletDynamics_SRCS
 	Featherstone/btMultiBodyJointMotor.cpp
 	MLCPSolvers/btDantzigLCP.cpp
 	MLCPSolvers/btMLCPSolver.cpp
+	MLCPSolvers/btLemkeAlgorithm.cpp
 )
 
 SET(Root_HDRS
@@ -96,6 +97,8 @@ SET(MLCPSolvers_HDRS
 	MLCPSolvers/btMLCPSolverInterface.h
 	MLCPSolvers/btPATHSolver.h
 	MLCPSolvers/btSolveProjectedGaussSeidel.h	
+	MLCPSolvers/btLemkeSolver.h
+	MLCPSolvers/btLemkeAlgorithm.h
 )
 
 SET(Character_HDRS