From d65089e8e00141460cfd8d1a6651823ea753aee3 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@replicant.com>
Date: Thu, 15 May 2014 15:39:26 -0700
Subject: [PATCH] cmake improvements

---
 Demos/premake4.lua                  | 10 ++++++----
 Demos3/AllBullet2Demos/premake4.lua |  6 +++---
 build3/premake4.lua                 |  8 ++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Demos/premake4.lua b/Demos/premake4.lua
index 65c3ab34f..c488759b7 100644
--- a/Demos/premake4.lua
+++ b/Demos/premake4.lua
@@ -8,9 +8,14 @@ function createDemos( demos, incdirs, linknames)
 			
 			kind "ConsoleApp"
 			targetdir ".."
+
+		configuration {}
 	
 	  	includedirs {incdirs}
-	  
+		links {
+                                linknames
+                        }
+
 		configuration { "Windows" }
 			defines { "GLEW_STATIC"}
 	 		links { "opengl32" }
@@ -31,9 +36,6 @@ function createDemos( demos, incdirs, linknames)
 			links {"GL","GLU","glut"}
 		configuration{}
 	
-		links { 
-				linknames
-			}
 		
 		files     { 
 		 	"./" .. name .. "/*.cpp" ,
diff --git a/Demos3/AllBullet2Demos/premake4.lua b/Demos3/AllBullet2Demos/premake4.lua
index 436e1fa8d..c7002808d 100644
--- a/Demos3/AllBullet2Demos/premake4.lua
+++ b/Demos3/AllBullet2Demos/premake4.lua
@@ -13,11 +13,11 @@
                 "../../btgui/lua-5.2.3/src"
                 }
 
-		initOpenGL()
-		initGlew()
 			
 		links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
-		
+		initOpenGL()
+		initGlew()
+	
 		files {
 		"**.cpp",
 		"**.h",
diff --git a/build3/premake4.lua b/build3/premake4.lua
index 7c2d48ce3..6b679d976 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -162,13 +162,9 @@ end
 		include "../test/enet/client"
 	end
 
+	include "../Demos"
+	include "../Extras"
 
 	if _OPTIONS["bullet2gpu"] then
-		include "../src/LinearMath"
-        include "../src/BulletCollision"
-        include "../src/BulletDynamics"
-        include "../src/BulletSoftBody"
-        include "../ObsoleteDemos/HelloWorld"
-        include "../Demos3"
 	end