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

Build: Fix support for executable tools 

Former-commit-id: c6a986ed730d5d5eac043fbf66434821aa6f6839
This commit is contained in:
Lynix 2015-09-19 01:12:57 +02:00
parent 2c752a38c3
commit a09f859144
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
build/scripts/common.lua
View File

@ -269,47 +269,61 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86") libdirs("../extlibs/lib/mingw/x86")
libdirs("../lib/mingw/x86") libdirs("../lib/mingw/x86")
targetdir("../lib/mingw/x86") if (toolTable.Kind == "library") then
targetdir("../lib/mingw/x86")
end
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64") libdirs("../extlibs/lib/mingw/x64")
libdirs("../lib/mingw/x64") libdirs("../lib/mingw/x64")
targetdir("../lib/mingw/x64") if (toolTable.Kind == "library") then
targetdir("../lib/mingw/x64")
end
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86") libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86") libdirs("../lib/msvc/x86")
targetdir("../lib/msvc/x86") if (toolTable.Kind == "library") then
targetdir("../lib/msvc/x86")
end
configuration({"vs*", "x64"}) configuration({"vs*", "x64"})
libdirs("../extlibs/lib/msvc/x64") libdirs("../extlibs/lib/msvc/x64")
libdirs("../lib/msvc/x64") libdirs("../lib/msvc/x64")
targetdir("../lib/msvc/x64") if (toolTable.Kind == "library") then
targetdir("../lib/msvc/x64")
end
configuration({"xcode3 or xcode4", "x32"}) configuration({"xcode3 or xcode4", "x32"})
libdirs("../extlibs/lib/xcode/x86") libdirs("../extlibs/lib/xcode/x86")
libdirs("../lib/xcode/x86") libdirs("../lib/xcode/x86")
targetdir("../lib/xcode/x86") if (toolTable.Kind == "library") then
targetdir("../lib/xcode/x86")
end
configuration({"xcode3 or xcode4", "x64"}) configuration({"xcode3 or xcode4", "x64"})
libdirs("../extlibs/lib/xcode/x64") libdirs("../extlibs/lib/xcode/x64")
libdirs("../lib/xcode/x64") libdirs("../lib/xcode/x64")
targetdir("../lib/xcode/x64") if (toolTable.Kind == "library") then
targetdir("../lib/xcode/x64")
end
configuration("*Static") if (toolTable.Kind == "library") then
kind("StaticLib") configuration("*Static")
kind("StaticLib")
configuration("*Dynamic") configuration("*Dynamic")
kind("SharedLib") kind("SharedLib")
configuration("DebugStatic")
targetsuffix("-s-d")
configuration("DebugStatic") configuration("ReleaseStatic")
targetsuffix("-s-d") targetsuffix("-s")
configuration("ReleaseStatic") configuration("DebugDynamic")
targetsuffix("-s") targetsuffix("-d")
end
configuration("DebugDynamic")
targetsuffix("-d")
configuration({}) configuration({})