Merge pull request #238 from erwincoumans/master

premake: use *.cpp insteadl of **.cpp

Demos3/AllBullet2Demos/premake4.lua

@@ -4,7 +4,6 @@
 		language "C++"
 				
 		kind "ConsoleApp"
-		targetdir "../../bin"
 
   	includedirs {
                 ".",
@@ -14,7 +13,7 @@
                 }
 
 			
-		links{"gwen", "OpenGL_Window","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
+		links{"gwen", "OpenGL_Window","BulletDynamics","BulletCollision","LinearMath","Bullet3Common","lua-5.2.3"}
 		initOpenGL()
 		initGlew()
 
@@ -103,8 +102,6 @@
 --		"../bullet2/LuaDemo/LuaDemo.h",
 		
 		
-		"../../src/Bullet3Common/**.cpp",
- 		"../../src/Bullet3Common/**.h",
 		"../../btgui/Timing/b3Clock.cpp",
 		"../../btgui/Timing/b3Clock.h",
 		"../GpuDemos/gwenUserInterface.cpp",

Demos3/SimpleOpenGL3/premake4.lua

@@ -4,7 +4,6 @@
 		language "C++"
 				
 		kind "ConsoleApp"
-		targetdir "../../bin"
 
   	includedirs {
                 ".",
@@ -13,16 +12,13 @@
                 }
 
 			
-		links{ "OpenGL_Window"}
+		links{ "OpenGL_Window","Bullet3Common"}
 		initOpenGL()	
 		initGlew()
 	
 		files {
-		"**.cpp",
-		"**.h",
-		"../../src/Bullet3Common/**.cpp",
- 		"../../src/Bullet3Common/**.h",
-
+		"*.cpp",
+		"*.h",
 		}
 		
 if os.is("Linux") then initX11() end

btgui/Gwen/premake4.lua

@@ -11,11 +11,21 @@ end
 	
 	defines { "GWEN_COMPILE_STATIC" , "_HAS_EXCEPTIONS=0", "_STATIC_CPPLIB" }
 	 defines { "DONT_USE_GLUT"}	
-	targetdir "../../lib"	
 	includedirs {
 		".",".."
 	}
 	files {
-		"**.cpp",
-		"**.h"
+		"*.cpp",
+		"*.h",
+		"Controls/*.cpp",
+		"Controls/*.h",
+		"Controls/Dialog/*.cpp",
+		"Controls/Dialogs/*.h",
+		"Controls/Layout/*.h",
+		"Controls/Property/*.h",
+		"Input/*.h",
+		"Platforms/*.cpp",
+		"Renderers/*.cpp",
+		"Skins/*.cpp",
+		"Skins/*.h"
 	}

btgui/OpenGLWindow/premake4.lua

@@ -17,8 +17,11 @@
 		--}
 		
 		files {
-			"**.cpp",
-			"**.h",
+			"*.cpp",
+			"*.h",
+			"OpenGLWindow/*.c",
+			"OpenGLWindow/*.h",
+			"OpenGLWindow/GL/*.h"
 		}
 
 		if not os.is("Windows") then 

src/Bullet3Common/premake4.lua

@@ -7,6 +7,6 @@
 	includedirs {".."}
 
 	files {
-		"**.cpp",
-		"**.h"
+		"*.cpp",
+		"*.h"
 	}

src/BulletCollision/premake4.lua

@@ -1,7 +1,6 @@
 	project "BulletCollision"
 
 	kind "StaticLib"
-	targetdir "../../lib"
 	includedirs {
 		"..",
 	}

src/BulletDynamics/premake4.lua

@@ -1,11 +1,21 @@
-	project "BulletDynamics"
-		
-	kind "StaticLib"
-	targetdir "../../lib"
-	includedirs {
-		"..",
-	}
-	files {
-		"**.cpp",
-		"**.h"
-	}
+	project "BulletDynamics"
+	kind "StaticLib"
+	includedirs {
+		"..",
+	}
+	files {
+		"Dynamics/*.cpp",
+                "Dynamics/*.h",
+                "ConstraintSolver/*.cpp",
+                "ConstraintSolver/*.h",
+                "Featherstone/*.cpp",
+                "Featherstone/*.h",
+                "MLCPSolvers/*.cpp",
+                "MLCPSolvers/*.h",
+                "Vehicle/*.cpp",
+                "Vehicle/*.h",
+                "Character/*.cpp",
+                "Character/*.h"
+
+	}
+

src/LinearMath/premake4.lua

@@ -1,7 +1,6 @@
 	project "LinearMath"
 
 	kind "StaticLib"
-	targetdir "../../lib"
 	includedirs {
 		"..",
 	}