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/ThirdPartyLibs/Gwen/premake4.lua
+++ b/examples/ThirdPartyLibs/Gwen/premake4.lua
@@ -11,6 +11,9 @@ end
 	
 	defines { "GWEN_COMPILE_STATIC"  }
 	 defines { "DONT_USE_GLUT"}	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	includedirs {
 		".",".."
 	}