Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake improvements

Browse Source
This commit is contained in:
Erwin Coumans
2014-05-15 15:39:26 -07:00
parent 5c1fc2e3a4
commit d65089e8e0
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/premake4.lua
View File

@@ -9,7 +9,12 @@ function createDemos( demos, incdirs, linknames)
kind "ConsoleApp" kind "ConsoleApp"
targetdir ".." targetdir ".."
configuration {}
includedirs {incdirs} includedirs {incdirs}
links {
linknames
}
configuration { "Windows" } configuration { "Windows" }
defines { "GLEW_STATIC"} defines { "GLEW_STATIC"}
@@ -31,9 +36,6 @@ function createDemos( demos, incdirs, linknames)
links {"GL","GLU","glut"} links {"GL","GLU","glut"}
configuration{} configuration{}
links {
linknames
}
files { files {
"./" .. name .. "/*.cpp" , "./" .. name .. "/*.cpp" ,

4
Demos3/AllBullet2Demos/premake4.lua
View File

@@ -13,10 +13,10 @@
"../../btgui/lua-5.2.3/src" "../../btgui/lua-5.2.3/src"
} }
initOpenGL()
initGlew()
links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"} links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
initOpenGL()
initGlew()
files { files {
"**.cpp", "**.cpp",

8
build3/premake4.lua
View File

@@ -162,13 +162,9 @@ end
include "../test/enet/client" include "../test/enet/client"
end end
include "../Demos"
include "../Extras"
if _OPTIONS["bullet2gpu"] then if _OPTIONS["bullet2gpu"] then
include "../src/LinearMath"
include "../src/BulletCollision"
include "../src/BulletDynamics"
include "../src/BulletSoftBody"
include "../ObsoleteDemos/HelloWorld"
include "../Demos3"
end end