Merge remote-tracking branch 'upstream/master'

2018-02-15 14:31:34 -08:00
parent cf4a0a3503
commit 36dcabbaf5
50 changed files with 332 additions and 138 deletions
--- a/Extras/Serialize/BulletFileLoader/premake4.lua
+++ b/Extras/Serialize/BulletFileLoader/premake4.lua
@@ -2,6 +2,10 @@
 		
 	kind "StaticLib"
 	
+	if os.is("Linux") then
+	    buildoptions{"-fPIC"}
+	end
+	 
 	includedirs {
 		"../../../src"
 	}
--- a/Extras/Serialize/BulletWorldImporter/premake4.lua
+++ b/Extras/Serialize/BulletWorldImporter/premake4.lua
@@ -6,7 +6,11 @@
 		"../BulletFileLoader",
 		"../../../src"
 	}
-	 
+
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+    	 
 	files {
 		"**.cpp",
 		"**.h"
--- a/Extras/Serialize/BulletXmlWorldImporter/premake4.lua
+++ b/Extras/Serialize/BulletXmlWorldImporter/premake4.lua
@@ -1,7 +1,7 @@
 	project "BulletXmlWorldImporter"
 		
 	kind "StaticLib"
-	targetdir "../../lib"
+	--targetdir "../../lib"
 	includedirs {
 		"../BulletWorldImporter",
 		"../BulletFileLoader",
@@ -11,4 +11,4 @@
 	files {
 		"**.cpp",
 		"**.h"
-	}
+	}