From ef0ddb5ef1ebdebb4af52d8f90c663e5a7081459 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 17 Aug 2016 13:11:52 +0200 Subject: [PATCH] Build: Fix an oopsie Former-commit-id: d1411c2e1f1ee8ce5d2773c0834e2e9c06732a21 [formerly 0dff837b8db9c262dd71dec1ba83fe4f36b98de7] [formerly 70f74c0e185d1a8bbd791ddd1316b5b2df92a50a [formerly 95ff56ebb91662f7e9211c79d7af9e14f6a3f403]] Former-commit-id: f5e08860c71fc922d7aab1ea584b22b99862773b [formerly 76482eaed8258fdc0ebe82736a52d6cf6b711201] Former-commit-id: 5b7c4ba98d7f9bb5485dbca7bb24cc9890125cd9 --- build/scripts/common.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index b8ca27e70..b20d213fa 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -278,6 +278,7 @@ function NazaraBuild:Execute() self:MakeInstallCommands(toolTable) elseif (toolTable.Kind == "application") then debugdir(toolTable.TargetDirectory) + targetdir(toolTable.TargetDirectory) if (toolTable.EnableConsole) then kind("ConsoleApp") else @@ -295,8 +296,6 @@ function NazaraBuild:Execute() libdirs("../lib") libdirs("../extlibs/lib/common") - targetdir(toolTable.TargetDirectory) - configuration("x32") libdirs(toolTable.LibraryPaths.x86) @@ -306,7 +305,7 @@ function NazaraBuild:Execute() configuration({"codeblocks or codelite or gmake", "x32"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") - libdirs(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") + libdirs("../lib/" .. makeLibDir .. "/x86") if (toolTable.Kind == "library") then targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") elseif (toolTable.Kind == "plugin") then @@ -315,6 +314,7 @@ function NazaraBuild:Execute() configuration({"codeblocks or codelite or gmake", "x64"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x64") + libdirs("../lib/" .. makeLibDir .. "/x86") if (toolTable.Kind == "library") then targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64") elseif (toolTable.Kind == "plugin") then