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

@@ -3,7 +3,11 @@ project "App_BulletExampleBrowser"
language "C++"
kind "ConsoleApp"
if os.is("Linux") then
buildoptions{"-fPIC"}
end
hasCL = findOpenCL("clew")
if (hasCL) then
@@ -209,6 +213,10 @@ project "BulletExampleBrowserLib"
"../../src",
"../ThirdPartyLibs",
}
if os.is("Linux") then
buildoptions{"-fPIC"}
end
if _OPTIONS["lua"] then
includedirs{"../ThirdPartyLibs/lua-5.2.3/src"}