[*] Added check for Aurora.Settings.bIsBuildDirWd
This commit is contained in:
parent
a3bba89553
commit
5631e99efd
@ -9,7 +9,9 @@ local function configureProjectForSolution(prj)
|
||||
filter(auFilterConfig(Aurora.Settings.sNameOfDebug))
|
||||
defines { "DEBUG" }
|
||||
targetdir(Aurora.Settings.sAbsCompilerWd .. "/Bin/" .. Aurora.Settings.sNameOfDebug)
|
||||
debugdir(Aurora.Settings.sAbsDebug)
|
||||
if (Aurora.Settings.bIsBuildDirWd) then
|
||||
debugdir(Aurora.Settings.sAbsDebug)
|
||||
end
|
||||
flags "NoIncrementalLink"
|
||||
|
||||
filter(auFilterConfig({Aurora.Settings.sNameOfInternal, Aurora.Settings.sNameOfShip}))
|
||||
@ -19,13 +21,17 @@ local function configureProjectForSolution(prj)
|
||||
filter(auFilterConfig(Aurora.Settings.sNameOfInternal))
|
||||
defines { "STAGING" }
|
||||
targetdir(Aurora.Settings.sAbsCompilerWd .. "/Bin/" .. Aurora.Settings.sNameOfInternal)
|
||||
debugdir(Aurora.Settings.sAbsStage)
|
||||
if (Aurora.Settings.bIsBuildDirWd) then
|
||||
debugdir(Aurora.Settings.sAbsStage)
|
||||
end
|
||||
flags "NoIncrementalLink"
|
||||
|
||||
filter(auFilterConfig(Aurora.Settings.sNameOfShip))
|
||||
defines { "SHIP" }
|
||||
targetdir(Aurora.Settings.sAbsCompilerWd .. "/Bin/" .. Aurora.Settings.sNameOfShip)
|
||||
debugdir(Aurora.Settings.sAbsShip)
|
||||
if (Aurora.Settings.bIsBuildDirWd) then
|
||||
debugdir(Aurora.Settings.sAbsShip)
|
||||
end
|
||||
flags "LinkTimeOptimization"
|
||||
filter {}
|
||||
|
||||
@ -44,6 +50,10 @@ local function configureProjectForSolution(prj)
|
||||
end
|
||||
|
||||
local function setBestDebugDir(dest)
|
||||
if (not Aurora.Settings.bIsBuildDirWd) then
|
||||
return
|
||||
end
|
||||
|
||||
if (not dest or dest:starts(kPathPrefix)) then
|
||||
local append = dest and dest:sub(#kPathPrefix + 1)
|
||||
if (not append) then append = "" end
|
||||
@ -166,6 +176,11 @@ end
|
||||
local function configureProjectForDebug(prj)
|
||||
local debugDir = nil
|
||||
|
||||
if (not Aurora.Settings.bIsBuildDirWd) then
|
||||
debugdir(Aurora.Settings.sAbsWd)
|
||||
return
|
||||
end
|
||||
|
||||
if (type(prj.dest) == "string") then
|
||||
debugDir = prj.dest
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user