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/src/Bullet3Common/premake4.lua
+++ b/src/Bullet3Common/premake4.lua
@@ -4,6 +4,10 @@
 				
 	kind "StaticLib"
 		
+	if os.is("Linux") then
+	    buildoptions{"-fPIC"}
+	end
+
 	includedirs {".."}

 	files {