Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
Former-commit-id: 25bdf44e4ef7458a50ab60cd5f6bd49522528c23
This commit is contained in:
commit
c4c8904aca
|
|
@ -71,7 +71,7 @@ function NazaraBuild:Execute()
|
||||||
targetsuffix("-s")
|
targetsuffix("-s")
|
||||||
|
|
||||||
configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
|
configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
|
||||||
buildoptions("-std=c++11")
|
buildoptions("-std=c++14")
|
||||||
|
|
||||||
for k, libTable in ipairs(self.OrderedExtLibs) do
|
for k, libTable in ipairs(self.OrderedExtLibs) do
|
||||||
project(libTable.Name)
|
project(libTable.Name)
|
||||||
|
|
@ -125,7 +125,7 @@ function NazaraBuild:Execute()
|
||||||
defines("NAZARA_STATIC")
|
defines("NAZARA_STATIC")
|
||||||
|
|
||||||
configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
|
configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
|
||||||
buildoptions("-std=c++11")
|
buildoptions("-std=c++14")
|
||||||
|
|
||||||
configuration({"linux or bsd or macosx", "gmake"})
|
configuration({"linux or bsd or macosx", "gmake"})
|
||||||
buildoptions("-fvisibility=hidden")
|
buildoptions("-fvisibility=hidden")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue