Merge remote-tracking branch 'upstream/master'

This commit is contained in:
yunfeibai
2018-02-15 14:31:34 -08:00
parent cf4a0a3503
commit 36dcabbaf5
50 changed files with 332 additions and 138 deletions

View File

@@ -5,6 +5,9 @@
includedirs {
"."
}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
files {
"*.cpp",
"*.h",

View File

@@ -11,6 +11,9 @@ end
defines { "GWEN_COMPILE_STATIC" }
defines { "DONT_USE_GLUT"}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
includedirs {
".",".."
}

View File

@@ -16,6 +16,9 @@
includedirs {
".","include","src"
}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
files {
"src/SimpleSocket.cpp",
"src/ActiveSocket.cpp",

View File

@@ -18,6 +18,9 @@
includedirs {
".","include"
}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
files {
"callbacks.c",
"compress.c",

View File

@@ -18,6 +18,9 @@
includedirs {
"src"
}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
files {
"src/*.c",
"src/*.h"

View File

@@ -4,6 +4,9 @@
includedirs {"include"}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
if os.is("Windows") then
files{
"src/impl/win.cc",