sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: Fix project generation for Linux 

Former-commit-id: 9e0787779d9c8fa84f3f41a6f75e7bf29be403d4
This commit is contained in:
Lynix 2015-09-28 00:41:59 +02:00
parent 0112d5746f
commit 05056d41de
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/scripts/common.lua
View File

@ -6,6 +6,8 @@ function NazaraBuild:Execute()
end end
if (self.Actions[_ACTION] == nil) then if (self.Actions[_ACTION] == nil) then
local makeLibDir = os.is("windows") and "mingw" or "gmake"
if (#self.OrderedExtLibs > 0) then if (#self.OrderedExtLibs > 0) then
solution("NazaraExtlibs") solution("NazaraExtlibs")
platforms({"x32", "x64"}) platforms({"x32", "x64"})
@ -28,12 +30,12 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/common/x64") libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86") libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
targetdir("../extlibs/lib/mingw/x86") targetdir("../extlibs/lib/" .. makeLibDir .. "/x86")
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64") libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
targetdir("../extlibs/lib/mingw/x64") targetdir("../extlibs/lib/" .. makeLibDir .. "/x64")
configuration("vs*") configuration("vs*")
buildoptions("/MP") buildoptions("/MP")
@ -71,7 +73,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++14") buildoptions({"-fPIC", "-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)
@ -171,14 +173,14 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/common/x64") libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86") libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
libdirs("../lib/mingw/x86") libdirs("../lib/" .. makeLibDir .. "/x86")
targetdir("../lib/mingw/x86") targetdir("../lib/" .. makeLibDir .. "/x86")
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64") libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
libdirs("../lib/mingw/x64") libdirs("../lib/" .. makeLibDir .. "/x64")
targetdir("../lib/mingw/x64") targetdir("../lib/" .. makeLibDir .. "/x64")
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86") libdirs("../extlibs/lib/msvc/x86")
@ -268,17 +270,17 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/common/x64") libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86") libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
libdirs("../lib/mingw/x86") libdirs("../lib/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir("../lib/mingw/x86") targetdir("../lib/" .. makeLibDir .. "/x86")
end end
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64") libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
libdirs("../lib/mingw/x64") libdirs("../lib/" .. makeLibDir .. "/x64")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir("../lib/mingw/x64") targetdir("../lib/" .. makeLibDir .. "/x64")
end end
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
@ -379,10 +381,10 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/common/x64") libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../lib/mingw/x86") libdirs("../lib/" .. makeLibDir .. "/x86")
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../lib/mingw/x64") libdirs("../lib/" .. makeLibDir .. "/x64")
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
libdirs("../lib/msvc/x86") libdirs("../lib/msvc/x86")