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

Premake4 build system fix: only disable exception handling for msvc 2008, 2010, not for 2005 because it fails without service pack.

Browse Source
This commit is contained in:
erwin.coumans
2011-09-16 22:52:47 +00:00
parent d3dc7afefd
commit eb6d511565
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
msvc/premake4.lua
View File

@@ -3,12 +3,7 @@
solution "0BulletSolution" solution "0BulletSolution"
-- Multithreaded compiling
--if _ACTION == "vs2010" or _ACTION=="vs2008" then
--vs2008 seems unstable with /MP, causing internal linker errors
if _ACTION == "vs2010" then
buildoptions { "/MP" }
end
newoption { newoption {
trigger = "with-nacl", trigger = "with-nacl",
@@ -65,9 +60,22 @@ solution "0BulletSolution"
if not _OPTIONS["with-nacl"] then if not _OPTIONS["with-nacl"] then
flags { "NoRTTI", "NoExceptions"}
flags { "NoRTTI"}
targetdir "../bin"
-- Disable exception handling on MSVC 2008 and higher. MSVC 2005 without service pack has some linker issue (ConvexDecompositionDemo uses STL through HACD library)
if _ACTION == "vs2010" or _ACTION=="vs2008" then
flags { "NoExceptions"}
defines { "_HAS_EXCEPTIONS=0" } defines { "_HAS_EXCEPTIONS=0" }
targetdir "../bin" end
-- Multithreaded compiling
if _ACTION == "vs2010" then
buildoptions { "/MP" }
end
else else
targetdir "../bin_html" targetdir "../bin_html"
end end