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/test/SharedMemory/premake4.lua
+++ b/test/SharedMemory/premake4.lua
@@ -164,6 +164,9 @@ project ("Test_PhysicsServerLoopBack")
 			"BussIK",
 			"LinearMath"
 		}
+        if os.is("Linux") then
+            links{"dl"}
+        end
 			
 		files {
 			"test.c",
@@ -250,6 +253,9 @@ end
 			"BussIK",
 			"LinearMath"
 		}
+        if os.is("Linux") then
+            links{"dl"}
+        end
 			
 		files {
 			"test.c",