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

Build: Fix an oopsie 

Former-commit-id: d1411c2e1f1ee8ce5d2773c0834e2e9c06732a21 [formerly 0dff837b8db9c262dd71dec1ba83fe4f36b98de7] [formerly 70f74c0e185d1a8bbd791ddd1316b5b2df92a50a [formerly 95ff56ebb91662f7e9211c79d7af9e14f6a3f403]]
Former-commit-id: f5e08860c71fc922d7aab1ea584b22b99862773b [formerly 76482eaed8258fdc0ebe82736a52d6cf6b711201]
Former-commit-id: 5b7c4ba98d7f9bb5485dbca7bb24cc9890125cd9
This commit is contained in:
Lynix 2016-08-17 13:11:52 +02:00
parent 62ebc3e8cf
commit ef0ddb5ef1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/scripts/common.lua
View File

@ -278,6 +278,7 @@ function NazaraBuild:Execute()
self:MakeInstallCommands(toolTable) self:MakeInstallCommands(toolTable)
elseif (toolTable.Kind == "application") then elseif (toolTable.Kind == "application") then
debugdir(toolTable.TargetDirectory) debugdir(toolTable.TargetDirectory)
targetdir(toolTable.TargetDirectory)
if (toolTable.EnableConsole) then if (toolTable.EnableConsole) then
kind("ConsoleApp") kind("ConsoleApp")
else else
@ -295,8 +296,6 @@ function NazaraBuild:Execute()
libdirs("../lib") libdirs("../lib")
libdirs("../extlibs/lib/common") libdirs("../extlibs/lib/common")
targetdir(toolTable.TargetDirectory)
configuration("x32") configuration("x32")
libdirs(toolTable.LibraryPaths.x86) libdirs(toolTable.LibraryPaths.x86)
@ -306,7 +305,7 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
libdirs(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") libdirs("../lib/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
@ -315,6 +314,7 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x64") libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
libdirs("../lib/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then