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/gtest-1.7.0/premake4.lua
+++ b/test/gtest-1.7.0/premake4.lua
@@ -16,3 +16,7 @@
 	includedirs {
 		".","include"
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+