From 576c7c3f5d72a187499b7443885653983b069df0 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: e47425b9ff79fc0cb3342594422bb5e20cbc4250 [formerly 373a7d7f61de3a74cd4302389b94e78ccd47ed8d] [formerly cc40ac8e81efa2207d533729cf117b786922b92f [formerly 9fe0392a9506a796791b3a21c54236ad638bd6fc]] Former-commit-id: 18791f6f0c493e6cd28be214431f7e18a39e8741 [formerly 49f8a79996b9fc6698d091472c5347dd0c8d0081] Former-commit-id: 45316bf33503cd2fd1d0bbdbffe21dff6d22f565 --- 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