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/examples/SharedMemory/udp/premake4.lua
+++ b/examples/SharedMemory/udp/premake4.lua
@@ -14,6 +14,7 @@ project ("App_PhysicsServerSharedMemoryBridgeUDP")
 		links {"Ws2_32","Winmm"}
 	end
 	if os.is("Linux") then
+	    links{"dl"}
 	end
 	if os.is("MacOSX") then
 	end		
@@ -68,6 +69,9 @@ if os.is("Windows") then
 	defines { "WIN32" }
 	links {"Ws2_32","Winmm"}
 end
+	if os.is("Linux") then
+	    links{"dl"}
+	end

 language "C++"