From b3597d53303877bd695d5b8c2e839ae56ca866e2 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 15 Jun 2015 21:14:20 +0200 Subject: [PATCH] Build: Fix library directories Former-commit-id: 7bf4a9078e03e0de9ec8ab3df2303d4e3eb9e031 --- build/scripts/common.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 6ef47d7d1..a321c1369 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -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)