From 0656de3057a0e34f3f0d9b91d3be61f25f95f8c7 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Fri, 16 Sep 2011 19:56:14 +0000
Subject: [PATCH] premake4 compile/link fixes

---
 Demos/premake4.lua                      | 2 +-
 Extras/ConvexDecomposition/premake4.lua | 9 +++++++++
 Extras/premake4.lua                     | 1 +
 msvc/premake4.lua                       | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Extras/ConvexDecomposition/premake4.lua

diff --git a/Demos/premake4.lua b/Demos/premake4.lua
index 5ecdf0e0e..d757aabfa 100644
--- a/Demos/premake4.lua
+++ b/Demos/premake4.lua
@@ -76,7 +76,7 @@ end
 
  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"})
  
diff --git a/Extras/ConvexDecomposition/premake4.lua b/Extras/ConvexDecomposition/premake4.lua
new file mode 100644
index 000000000..8a91bea50
--- /dev/null
+++ b/Extras/ConvexDecomposition/premake4.lua
@@ -0,0 +1,9 @@
+	project "ConvexDecomposition"
+		
+	kind "StaticLib"
+	targetdir "../../lib"
+	includedirs {".","../../src"}
+	files {
+		"**.cpp",
+		"**.h"
+	}
\ No newline at end of file
diff --git a/Extras/premake4.lua b/Extras/premake4.lua
index 71f94a38c..ca5c766f6 100644
--- a/Extras/premake4.lua
+++ b/Extras/premake4.lua
@@ -1,5 +1,6 @@
 
 include "HACD"
+include "ConvexDecomposition"
 
 include "Serialize/BulletFileLoader"
 include "Serialize/BulletWorldImporter"
diff --git a/msvc/premake4.lua b/msvc/premake4.lua
index c26cbea7b..40c273432 100644
--- a/msvc/premake4.lua
+++ b/msvc/premake4.lua
@@ -4,7 +4,9 @@
 solution "0BulletSolution"
 
 	-- 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"  }
 	end