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/serial/premake4.lua
+++ b/examples/ThirdPartyLibs/serial/premake4.lua
@@ -4,6 +4,9 @@
 	
 	includedirs {"include"}
 	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	if os.is("Windows") then 
 		files{
 			 "src/impl/win.cc",