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/tcp/premake4.lua
+++ b/examples/SharedMemory/tcp/premake4.lua
@@ -73,6 +73,7 @@ links {
        end
        if os.is("Linux") then
                defines {"_LINUX"}
+                links{"dl"}
        end
        if os.is("MacOSX") then
                defines {"_DARWIN"}