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

Build: Fix library directories 

Former-commit-id: 7bf4a9078e03e0de9ec8ab3df2303d4e3eb9e031
This commit is contained in:
Lynix 2015-06-15 21:14:20 +02:00
parent b680bb68c8
commit b3597d5330
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build/scripts/common.lua
View File

@ -168,26 +168,32 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86")
libdirs("../lib/mingw/x86")
targetdir("../lib/mingw/x86")
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64")
libdirs("../lib/mingw/x64")
targetdir("../lib/mingw/x64")
configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86")
targetdir("../lib/msvc/x86")
configuration({"vs*", "x64"})
libdirs("../extlibs/lib/msvc/x64")
libdirs("../lib/msvc/x64")
targetdir("../lib/msvc/x64")
configuration({"xcode3 or xcode4", "x32"})
libdirs("../extlibs/lib/xcode/x86")
libdirs("../lib/xcode/x86")
targetdir("../lib/xcode/x86")
configuration({"xcode3 or xcode4", "x64"})
libdirs("../extlibs/lib/xcode/x64")
libdirs("../lib/xcode/x64")
targetdir("../lib/xcode/x64")
configuration("*Static")
@ -259,26 +265,32 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/mingw/x86")
libdirs("../lib/mingw/x86")
targetdir("../lib/mingw/x86")
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/mingw/x64")
libdirs("../lib/mingw/x64")
targetdir("../lib/mingw/x64")
configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86")
targetdir("../lib/msvc/x86")
configuration({"vs*", "x64"})
libdirs("../extlibs/lib/msvc/x64")
libdirs("../lib/msvc/x64")
targetdir("../lib/msvc/x64")
configuration({"xcode3 or xcode4", "x32"})
libdirs("../extlibs/lib/xcode/x86")
libdirs("../lib/xcode/x86")
targetdir("../lib/xcode/x86")
configuration({"xcode3 or xcode4", "x64"})
libdirs("../extlibs/lib/xcode/x64")
libdirs("../lib/xcode/x64")
targetdir("../lib/xcode/x64")
configuration("*Static")
@ -349,6 +361,24 @@ function NazaraBuild:Execute()
defines("NAZARA_PLATFORM_x64")
libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../lib/mingw/x86")
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../lib/mingw/x64")
configuration({"vs*", "x32"})
libdirs("../lib/msvc/x86")
configuration({"vs*", "x64"})
libdirs("../lib/msvc/x64")
configuration({"xcode3 or xcode4", "x32"})
libdirs("../lib/xcode/x86")
configuration({"xcode3 or xcode4", "x64"})
libdirs("../lib/xcode/x64")
for k,v in pairs(exampleTable.ConfigurationLibraries) do
configuration(k)
links(v)