[*] Linux builds would've been screwed without this. Still untested

This commit is contained in:
Reece Wilson 2022-01-17 20:36:04 +00:00
parent f4e1bfa241
commit baa55a507f
5 changed files with 12 additions and 17 deletions

View File

@ -98,9 +98,7 @@ local function addDest(name, projectType, dest)
end end
local function postBuildCommands(name, type, config, platformName, arch) local function postBuildCommands(name, type, config, platformName, arch)
local isWin = platformName == "win32" if (platformName == "win32") then
if (isWin) then
postbuildcommands(formatCpy(Aurora.Settings.sLibPrefix .. name, type, normalizeCpyPath(Aurora.Settings.sAbsSymbols), ".pdb", true, config, platformName, arch, name)) postbuildcommands(formatCpy(Aurora.Settings.sLibPrefix .. name, type, normalizeCpyPath(Aurora.Settings.sAbsSymbols), ".pdb", true, config, platformName, arch, name))
if (type == "SharedLib" or if (type == "SharedLib" or
@ -110,6 +108,7 @@ local function postBuildCommands(name, type, config, platformName, arch)
else else
if (type == "SharedLib" or if (type == "SharedLib" or
type == "StaticLib") then type == "StaticLib") then
local ext = (auFetchGlobal("Platforms")[platformName][type] or "")
postbuildcommands(formatCpy(Aurora.Settings.sLibPrefix .. name, type, normalizeCpyPath(Aurora.Settings.sRelLinkLibs), ext, true, config, platformName, arch, name)) postbuildcommands(formatCpy(Aurora.Settings.sLibPrefix .. name, type, normalizeCpyPath(Aurora.Settings.sRelLinkLibs), ext, true, config, platformName, arch, name))
end end
end end

View File

@ -168,7 +168,7 @@ function JsonProcessor(info)
end end
local handleLink = function(this) local handleLink = function(this)
dependson (this.info.name) dependson(this.info.name)
auForEach(result.linkSources, handleSourcesRel, info.path) auForEach(result.linkSources, handleSourcesRel, info.path)

View File

@ -16,7 +16,8 @@ local platforms = {
devChainCoreUtils = true, devChainCoreUtils = true,
elfSupportsRPath = true, elfSupportsRPath = true,
exts = { exts = {
SharedLib = ".so" SharedLib = ".so",
StaticLib = ".a"
} }
}, },
linux = { linux = {
@ -28,7 +29,8 @@ local platforms = {
devChainCoreUtils = true, devChainCoreUtils = true,
elfSupportsRPath = true, elfSupportsRPath = true,
exts = { exts = {
SharedLib = ".so" SharedLib = ".so",
StaticLib = ".a"
} }
}, },
mac = { mac = {
@ -36,7 +38,8 @@ local platforms = {
targetLocal = true, targetLocal = true,
devChainCoreUtils = true, devChainCoreUtils = true,
exts = { exts = {
SharedLib = ".dynlib" SharedLib = ".dynlib",
StaticLib = ".a"
} }
}, },
ios = { ios = {
@ -47,7 +50,8 @@ local platforms = {
defines = "_ANDROID_AURORA_PREPROCESSOR", defines = "_ANDROID_AURORA_PREPROCESSOR",
requiresElfStrip = true, requiresElfStrip = true,
exts = { exts = {
SharedLib = ".so" SharedLib = ".so",
StaticLib = ".a"
} }
} }
} }

View File

@ -5,10 +5,6 @@ local bugHack = targetingCmake or targetingWindows
local kPathPrefix = "!" local kPathPrefix = "!"
local addDest = function(name, projectType, dest)
buildHooks.addDest(name, projectType, dest)
end
local function configureProjectForSolution(prj) local function configureProjectForSolution(prj)
filter(auFilterConfig(Aurora.Settings.sNameOfDebug)) filter(auFilterConfig(Aurora.Settings.sNameOfDebug))
defines { "DEBUG" } defines { "DEBUG" }
@ -386,7 +382,7 @@ local function setupProject(prj)
buildHooks.startProject(prj.name, prj.projectType) buildHooks.startProject(prj.name, prj.projectType)
auForEach(prj.dest, function(v) auForEach(prj.dest, function(v)
addDest(prj.name, prj.projectType, v) buildHooks.addDest(prj.name, prj.projectType, v)
end) end)
print() print()

View File

@ -124,8 +124,4 @@ end
function auProcessSolution() function auProcessSolution()
processSolution() processSolution()
end
function auAddVist(vist)
addVisit(vist)
end end