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

Build: Fix an oopsie 

Former-commit-id: f04f167cb8d4b6596a0eb7f4fcfd14dbd2718f34 [formerly 57cc1fe61467e48037e9c2209669ec1694d2c2f9] [formerly 26ef47fa7468348453d13d94cb2f2d060e8ecd66 [formerly d5105954a02632b79fc84f1380a9199bd9b1a2e3]]
Former-commit-id: 02d8f0217a15a1d47157b752300a5446b12162e1 [formerly 4f595e0b7a16ec460f1f72013a6976d1aadd74f9]
Former-commit-id: f9e5c292baa89929463ca23699d5fa73aa814a34
This commit is contained in:
Lynix 2016-08-17 13:11:52 +02:00
parent e46267d8ae
commit db21a3204a
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