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/lua-5.2.3/premake4.lua
+++ b/examples/ThirdPartyLibs/lua-5.2.3/premake4.lua
@@ -18,6 +18,9 @@
 	includedirs {
 		"src"
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	files {
 		"src/*.c",
 		"src/*.h"