From baa55a507fce34c66869fc4cac6d7201da409e78 Mon Sep 17 00:00:00 2001
From: Reece <code@reece.sx>
Date: Mon, 17 Jan 2022 20:36:04 +0000
Subject: [PATCH] [*] Linux builds would've been screwed without this. Still
 untested

---
 Core/BuildHooks/BuildHooks.lua |  5 ++---
 Core/Legacy/jsonProcessor.lua  |  2 +-
 Core/Target/platform.lua       | 12 ++++++++----
 Core/project.lua               |  6 +-----
 Public/api.lua                 |  4 ----
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Core/BuildHooks/BuildHooks.lua b/Core/BuildHooks/BuildHooks.lua
index d2739af..6fdb5d5 100644
--- a/Core/BuildHooks/BuildHooks.lua
+++ b/Core/BuildHooks/BuildHooks.lua
@@ -98,9 +98,7 @@ local function addDest(name, projectType, dest)
 end
 
 local function postBuildCommands(name, type, config, platformName, arch)
-    local isWin = platformName == "win32"
-
-    if (isWin) then
+    if (platformName == "win32") then
         postbuildcommands(formatCpy(Aurora.Settings.sLibPrefix .. name, type, normalizeCpyPath(Aurora.Settings.sAbsSymbols), ".pdb", true, config, platformName, arch, name))
 
         if (type == "SharedLib" or 
@@ -110,6 +108,7 @@ local function postBuildCommands(name, type, config, platformName, arch)
     else
         if (type == "SharedLib" or 
             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))
         end
     end
diff --git a/Core/Legacy/jsonProcessor.lua b/Core/Legacy/jsonProcessor.lua
index c0be156..b63e4a0 100644
--- a/Core/Legacy/jsonProcessor.lua
+++ b/Core/Legacy/jsonProcessor.lua
@@ -168,7 +168,7 @@ function JsonProcessor(info)
     end
 
     local handleLink = function(this) 
-        dependson (this.info.name)
+        dependson(this.info.name)
 
         auForEach(result.linkSources, handleSourcesRel, info.path)
 
diff --git a/Core/Target/platform.lua b/Core/Target/platform.lua
index 7e44597..39b0f31 100644
--- a/Core/Target/platform.lua
+++ b/Core/Target/platform.lua
@@ -16,7 +16,8 @@ local platforms = {
         devChainCoreUtils = true,
         elfSupportsRPath = true,
         exts = {
-            SharedLib = ".so"
+            SharedLib = ".so",
+            StaticLib = ".a"
         }
     },
     linux = {
@@ -28,7 +29,8 @@ local platforms = {
         devChainCoreUtils = true,
         elfSupportsRPath = true,
         exts = {
-            SharedLib = ".so"
+            SharedLib = ".so",
+            StaticLib = ".a"
         }
     },
     mac = {
@@ -36,7 +38,8 @@ local platforms = {
         targetLocal = true,
         devChainCoreUtils = true,
         exts = {
-            SharedLib = ".dynlib"
+            SharedLib = ".dynlib",
+            StaticLib = ".a"
         }
     },
     ios = {
@@ -47,7 +50,8 @@ local platforms = {
         defines = "_ANDROID_AURORA_PREPROCESSOR",
         requiresElfStrip = true,
         exts = {
-            SharedLib = ".so"
+            SharedLib = ".so",
+            StaticLib = ".a"
         }
     }
 }
diff --git a/Core/project.lua b/Core/project.lua
index 2cc45de..327e086 100644
--- a/Core/project.lua
+++ b/Core/project.lua
@@ -5,10 +5,6 @@ local bugHack = targetingCmake or targetingWindows
 
 local kPathPrefix = "!"
 
-local addDest = function(name, projectType, dest)
-    buildHooks.addDest(name, projectType, dest)
-end
-
 local function configureProjectForSolution(prj)
     filter(auFilterConfig(Aurora.Settings.sNameOfDebug))
         defines { "DEBUG" }
@@ -386,7 +382,7 @@ local function setupProject(prj)
     buildHooks.startProject(prj.name, prj.projectType)
 
     auForEach(prj.dest, function(v)
-        addDest(prj.name, prj.projectType, v)
+        buildHooks.addDest(prj.name, prj.projectType, v)
     end)
 
     print()
diff --git a/Public/api.lua b/Public/api.lua
index 740a52b..685fe26 100644
--- a/Public/api.lua
+++ b/Public/api.lua
@@ -124,8 +124,4 @@ end
 
 function auProcessSolution()
     processSolution()
-end
-
-function auAddVist(vist)
-    addVisit(vist)
 end
\ No newline at end of file