premake4 compile/link fixes
This commit is contained in:
@@ -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"})
|
||||||
|
|
||||||
|
|||||||
9
Extras/ConvexDecomposition/premake4.lua
Normal file
9
Extras/ConvexDecomposition/premake4.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
project "ConvexDecomposition"
|
||||||
|
|
||||||
|
kind "StaticLib"
|
||||||
|
targetdir "../../lib"
|
||||||
|
includedirs {".","../../src"}
|
||||||
|
files {
|
||||||
|
"**.cpp",
|
||||||
|
"**.h"
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
include "HACD"
|
include "HACD"
|
||||||
|
include "ConvexDecomposition"
|
||||||
|
|
||||||
include "Serialize/BulletFileLoader"
|
include "Serialize/BulletFileLoader"
|
||||||
include "Serialize/BulletWorldImporter"
|
include "Serialize/BulletWorldImporter"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user