From f93eb6f5d1386ed1c4cecf76bf0c7a40f8fe4430 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 19 Aug 2016 01:49:36 +0200 Subject: [PATCH] Fixed linking of tools on GCC 64bits Former-commit-id: 3e11e8f2d7ac0c6856a618b30778432b2abb845c [formerly 84b2e7fdea81101189a15488adf8a299f2c94146] [formerly 25857bd3c5ee2df838145658a59396659269069f [formerly 4398fdf08d380ab6d2973323b14347e4ef88bdba]] Former-commit-id: 89f4498e34648bf5637b0a3a6556256c328ca0fd [formerly 92e91db53ccf7e0f1bdac31540772140f18adb4b] Former-commit-id: fe2780f5d39f288d778b59b315afbf1f3b629cd3 --- build/scripts/common.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index b20d213fa..cf6fa6560 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -314,7 +314,7 @@ function NazaraBuild:Execute() configuration({"codeblocks or codelite or gmake", "x64"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x64") - libdirs("../lib/" .. makeLibDir .. "/x86") + libdirs("../lib/" .. makeLibDir .. "/x64") if (toolTable.Kind == "library") then targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64") elseif (toolTable.Kind == "plugin") then @@ -1084,4 +1084,4 @@ function NazaraBuild:SetupModuleTable(infoTable) table.insert(infoTable.LibraryPaths.x64, "../extlibs/lib/common/x64") end -NazaraBuild.SetupToolTable = NazaraBuild.SetupInfoTable \ No newline at end of file +NazaraBuild.SetupToolTable = NazaraBuild.SetupInfoTable