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

Build: Fix an oopsie 

Former-commit-id: f0f30058efb92e7a24d66f480bb65a945880ad68 [formerly e591e16a60ba1768e5a057ca42fe5b86ea68c64f] [formerly 8cda2a08263f38358814c22387afe94436976fd4 [formerly fb3768694da2c6d4311a73c5583293b2b26bf8f3]]
Former-commit-id: 20cb578d12161750f9bd790f75c94de6b3ee5853 [formerly 78f6f9c6108bad01926e88b94bc27331190493be]
Former-commit-id: af429ed967d8753ba3c0a041c393d1eaf6da3dd7
This commit is contained in:
Lynix 2016-08-17 13:11:52 +02:00
parent 658526ff58
commit 5d308d7812
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)
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