From d4e4fdc2c52c8211e67b62036786f99362d249c8 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@google.com>
Date: Wed, 20 Aug 2014 16:48:46 -0700
Subject: [PATCH] fix Linux  and Cmake build

---
 Demos3/AllBullet2Demos/CMakeLists.txt | 14 +++++++++++---
 Demos3/AllBullet2Demos/premake4.lua   |  4 ++--
 btgui/CMakeLists.txt                  |  2 +-
 btgui/lua-5.2.3/CMakeLists.txt        | 13 +++++++++++++
 src/BulletDynamics/CMakeLists.txt     |  2 ++
 5 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 btgui/lua-5.2.3/CMakeLists.txt

diff --git a/Demos3/AllBullet2Demos/CMakeLists.txt b/Demos3/AllBullet2Demos/CMakeLists.txt
index ffbd167b2..df3a53a84 100644
--- a/Demos3/AllBullet2Demos/CMakeLists.txt
+++ b/Demos3/AllBullet2Demos/CMakeLists.txt
@@ -3,6 +3,7 @@
 INCLUDE_DIRECTORIES(
 	${BULLET_PHYSICS_SOURCE_DIR}/src 
 	${BULLET_PHYSICS_SOURCE_DIR}/btgui
+	${BULLET_PHYSICS_SOURCE_DIR}/btgui/lua-5.2.3/src
 )
  
  
@@ -12,6 +13,13 @@ SET(App_AllBullet2Demos_SRCS
 	BulletDemoEntries.h
 	GwenParameterInterface.cpp
 	GwenParameterInterface.h
+	GraphingTexture.h
+        GwenParameterInterface.h    
+	GwenProfileWindow.h         
+	GwenTextureWindow.h         
+	GraphingTexture.cpp         
+	GwenProfileWindow.cpp 
+	GwenTextureWindow.cpp
 	../bullet2/BasicDemo/Bullet2RigidBodyDemo.cpp
 	../bullet2/BasicDemo/Bullet2RigidBodyDemo.h
 	../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp
@@ -34,8 +42,8 @@ SET(App_AllBullet2Demos_SRCS
 #	../bullet2/ChainDemo/ChainDemo.h
 #	../bullet2/RagdollDemo/RagdollDemo.cpp
 #	../bullet2/RagdollDemo/RagdollDemo.h
-#	../bullet2/LuaDemo/LuaDemo.cpp
-#	../bullet2/LuaDemo/LuaDemo.h
+	../bullet2/LuaDemo/LuaPhysicsSetup.cpp
+	../bullet2/LuaDemo/LuaPhysicsSetup.h
 	../GpuDemos/gwenUserInterface.cpp
 	../GpuDemos/gwenUserInterface.h
 	../ImportURDFDemo/ImportURDFSetup.cpp
@@ -70,7 +78,7 @@ SET(App_AllBullet2Demos_SRCS
 )
 
 LINK_LIBRARIES(
-        Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+        lua-5.2.3 Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )
 
 IF (WIN32)
diff --git a/Demos3/AllBullet2Demos/premake4.lua b/Demos3/AllBullet2Demos/premake4.lua
index 994fd4dbe..dc128f6a9 100644
--- a/Demos3/AllBullet2Demos/premake4.lua
+++ b/Demos3/AllBullet2Demos/premake4.lua
@@ -44,8 +44,8 @@
 		"../bullet2/BasicDemo/Bullet2RigidBodyDemo.h",
 		"../bullet2/LuaDemo/LuaPhysicsSetup.cpp",
 		"../bullet2/LuaDemo/LuaPhysicsSetup.h",
-		"../DifferentialGearDemo/DifferentialGearSetup.cpp",
-		"../DifferentialGearDemo/DifferentialGearSetup.h",
+	--	"../DifferentialGearDemo/DifferentialGearSetup.cpp",
+--		"../DifferentialGearDemo/DifferentialGearSetup.h",
 		"../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp",
 		"../../Demos/BasicDemo/BasicDemoPhysicsSetup.h",
 		"../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp",
diff --git a/btgui/CMakeLists.txt b/btgui/CMakeLists.txt
index 1bce7969e..82b3ec97d 100644
--- a/btgui/CMakeLists.txt
+++ b/btgui/CMakeLists.txt
@@ -1,3 +1,3 @@
 if (OPENGL_FOUND)
-SUBDIRS(  Gwen OpenGLWindow )
+SUBDIRS(  Gwen OpenGLWindow lua-5.2.3)
 endif(OPENGL_FOUND)
diff --git a/btgui/lua-5.2.3/CMakeLists.txt b/btgui/lua-5.2.3/CMakeLists.txt
new file mode 100644
index 000000000..fe5b8c063
--- /dev/null
+++ b/btgui/lua-5.2.3/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+INCLUDE_DIRECTORIES(
+	.	
+	src
+)
+
+FILE(GLOB_RECURSE lua-5.2.3_SRCS "src/*.c")
+
+ADD_DEFINITIONS(-DLUA_COMPAT_ALL)
+
+FILE(GLOB_RECURSE lua-5.2.3_HDRS "src/*.h")
+
+ADD_LIBRARY(lua-5.2.3 ${lua-5.2.3_SRCS} ${lua-5.2.3_HDRS})
diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
index f971a9cf9..b053c5787 100644
--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(BulletDynamics_SRCS
 	ConstraintSolver/btGearConstraint.cpp
 	ConstraintSolver/btGeneric6DofConstraint.cpp
 	ConstraintSolver/btGeneric6DofSpringConstraint.cpp
+	ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
 	ConstraintSolver/btHinge2Constraint.cpp
 	ConstraintSolver/btHingeConstraint.cpp
 	ConstraintSolver/btPoint2PointConstraint.cpp
@@ -50,6 +51,7 @@ SET(ConstraintSolver_HDRS
 	ConstraintSolver/btGearConstraint.h
 	ConstraintSolver/btGeneric6DofConstraint.h
 	ConstraintSolver/btGeneric6DofSpringConstraint.h
+	ConstraintSolver/btGeneric6DofSpring2Constraint.h
 	ConstraintSolver/btHinge2Constraint.h
 	ConstraintSolver/btHingeConstraint.h
 	ConstraintSolver/btJacobianEntry.h