premake4 compile/link fixes

This commit is contained in:
erwin.coumans
2011-09-16 19:56:14 +00:00
parent bb29d15058
commit 0656de3057
4 changed files with 14 additions and 2 deletions

View File

@@ -76,7 +76,7 @@ end
createDemos(localdemos,{"../src","OpenGL"},{"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics"}) createDemos(localdemos,{"../src","OpenGL"},{"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics"})
createDemos({"ConvexDecompositionDemo"},{"../Extras/HACD","../src","OpenGL"},{"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics", "HACD"}) createDemos({"ConvexDecompositionDemo"},{"../Extras/HACD","../Extras/ConvexDecomposition","../src","OpenGL"},{"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics", "HACD","ConvexDecomposition"})
createDemos({"SoftDemo"},{"../src","OpenGL"}, {"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics", "BulletSoftBody"}) createDemos({"SoftDemo"},{"../src","OpenGL"}, {"OpenGLSupport","LinearMath","BulletCollision","BulletDynamics", "BulletSoftBody"})

View File

@@ -0,0 +1,9 @@
project "ConvexDecomposition"
kind "StaticLib"
targetdir "../../lib"
includedirs {".","../../src"}
files {
"**.cpp",
"**.h"
}

View File

@@ -1,5 +1,6 @@
include "HACD" include "HACD"
include "ConvexDecomposition"
include "Serialize/BulletFileLoader" include "Serialize/BulletFileLoader"
include "Serialize/BulletWorldImporter" include "Serialize/BulletWorldImporter"

View File

@@ -4,7 +4,9 @@
solution "0BulletSolution" solution "0BulletSolution"
-- Multithreaded compiling -- Multithreaded compiling
if _ACTION == "vs2010" or _ACTION=="vs2008" then --if _ACTION == "vs2010" or _ACTION=="vs2008" then
--vs2008 seems unstable with /MP, causing internal linker errors
if _ACTION == "vs2010" then
buildoptions { "/MP" } buildoptions { "/MP" }
end end