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

Fixed linking of tools on GCC 64bits 

Former-commit-id: 3e11e8f2d7ac0c6856a618b30778432b2abb845c [formerly 84b2e7fdea81101189a15488adf8a299f2c94146] [formerly 25857bd3c5ee2df838145658a59396659269069f [formerly 4398fdf08d380ab6d2973323b14347e4ef88bdba]]
Former-commit-id: 89f4498e34648bf5637b0a3a6556256c328ca0fd [formerly 92e91db53ccf7e0f1bdac31540772140f18adb4b]
Former-commit-id: fe2780f5d39f288d778b59b315afbf1f3b629cd3
This commit is contained in:
Lynix 2016-08-19 01:49:36 +02:00
parent db21a3204a
commit f93eb6f5d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/scripts/common.lua
View File

@ -314,7 +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") libdirs("../lib/" .. makeLibDir .. "/x64")
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
@ -1084,4 +1084,4 @@ function NazaraBuild:SetupModuleTable(infoTable)
table.insert(infoTable.LibraryPaths.x64, "../extlibs/lib/common/x64") table.insert(infoTable.LibraryPaths.x64, "../extlibs/lib/common/x64")
end end
NazaraBuild.SetupToolTable = NazaraBuild.SetupInfoTable NazaraBuild.SetupToolTable = NazaraBuild.SetupInfoTable