summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2026-03-03 03:20:02 +1100
committer Vas Crabb <vas@vastheman.com>2026-03-03 03:20:02 +1100
commitdaf683305d8fa8832a838f522b38e9b3594d3002 (patch)
treeb7f28ae731e274283c67249d6e7c5c0797574bd7
parent963f16eeeaee2a0702f08629aa6465d7f4ca60e7 (diff)
Hopedfully improve building in more configurations.
-rw-r--r--makefile9
-rw-r--r--scripts/genie.lua6
-rwxr-xr-xscripts/src/3rdparty.lua20
-rw-r--r--scripts/src/lib.lua2
4 files changed, 23 insertions, 14 deletions
diff --git a/makefile b/makefile
index a39a8ca5e0f..e86f7c7b772 100644
--- a/makefile
+++ b/makefile
@@ -1009,6 +1009,10 @@ $(info Clang $(CLANG_VERSION) detected)
ifneq ($(TARGETOS),asmjs)
ifeq ($(ARCHITECTURE),_x64)
ARCHITECTURE := _x64_clang
+else ifneq ($(filter aarch64%,$(UNAME_M)),)
+ARCHITECTURE := _arm64_clang
+else ifneq ($(filter aarch64%,$(UNAME_P)),)
+ARCHITECTURE := _arm64_clang
else ifneq ($(filter arm64%,$(UNAME_M)),)
ARCHITECTURE := _arm64_clang
else
@@ -1261,6 +1265,11 @@ linux_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-linux-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux-clang config=$(CONFIG)64 precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux-clang config=$(CONFIG)64
+.PHONY: linux_arm64_clang
+linux_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-linux-clang/Makefile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux-clang config=$(CONFIG)64 precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux-clang config=$(CONFIG)64
+
.PHONY: linux_x86_clang
linux_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-linux-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux-clang config=$(CONFIG)32 precompile
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 291327c75a6..79b19583c3c 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -657,19 +657,19 @@ else
end
end
-if _OPTIONS["with-system-jpeg"]~=nil then
+if _OPTIONS["with-system-jpeg"] == "1" then
defines {
"XMD_H",
}
end
-if not _OPTIONS["with-system-flac"]~=nil then
+if _OPTIONS["with-system-flac"] ~= "1" then
defines {
"FLAC__NO_DLL",
}
end
-if not _OPTIONS["with-system-pugixml"] then
+if _OPTIONS["with-system-pugixml"] ~= "1" then
defines {
"PUGIXML_HEADER_ONLY",
}
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index a62513b5639..011af653653 100755
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -14,7 +14,7 @@
-- expat library objects
--------------------------------------------------
-if _OPTIONS["with-system-expat"] ~= "0" then
+if _OPTIONS["with-system-expat"] ~= "1" then
project "expat"
uuid "f4cd40b1-c37c-452d-9785-640f26f0bf54"
kind "StaticLib"
@@ -120,7 +120,7 @@ end
-- zlib library objects
--------------------------------------------------
-if _OPTIONS["with-system-zlib"] ~= "0" then
+if _OPTIONS["with-system-zlib"] ~= "1" then
project "zlib"
uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9"
kind "StaticLib"
@@ -181,7 +181,7 @@ end
-- zstd library objects
--------------------------------------------------
-if _OPTIONS["with-system-zstd"] ~= "0" then
+if _OPTIONS["with-system-zstd"] ~= "1" then
project "zstd"
uuid "5edd8713-bc60-456d-9c95-b928a913c84b"
kind "StaticLib"
@@ -655,7 +655,7 @@ end
-- libJPEG library objects
--------------------------------------------------
-if _OPTIONS["with-system-jpeg"] ~= "0" then
+if _OPTIONS["with-system-jpeg"] ~= "1" then
project "jpeg"
uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca"
kind "StaticLib"
@@ -734,7 +734,7 @@ end
-- libflac library objects
--------------------------------------------------
-if _OPTIONS["with-system-flac"] ~= "0" then
+if _OPTIONS["with-system-flac"] ~= "1" then
project "flac"
uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a"
kind "StaticLib"
@@ -977,7 +977,7 @@ end
--------------------------------------------------
if (STANDALONE~=true) then
-if _OPTIONS["with-system-lua"] ~= "0" then
+if _OPTIONS["with-system-lua"] ~= "1" then
project "lua"
uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9"
kind "StaticLib"
@@ -1128,7 +1128,7 @@ end
-- SQLite3 library objects
--------------------------------------------------
-if _OPTIONS["with-system-sqlite3"] ~= "0" then
+if _OPTIONS["with-system-sqlite3"] ~= "1" then
project "sqlite3"
uuid "5cb3d495-57ed-461c-81e5-80dc0857517d"
kind "StaticLib"
@@ -1180,7 +1180,7 @@ end
--------------------------------------------------
if _OPTIONS["NO_USE_MIDI"] ~= "1" then
-if _OPTIONS["with-system-portmidi"] ~= "0" then
+if _OPTIONS["with-system-portmidi"] ~= "1" then
project "portmidi"
uuid "587f2da6-3274-4a65-86a2-f13ea315bb98"
kind "StaticLib"
@@ -1689,7 +1689,7 @@ end
--------------------------------------------------
if _OPTIONS["NO_USE_PORTAUDIO"] ~= "1" then
-if _OPTIONS["with-system-portaudio"] ~= "0" then
+if _OPTIONS["with-system-portaudio"] ~= "1" then
project "portaudio"
uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
kind "StaticLib"
@@ -1897,7 +1897,7 @@ end
-- utf8proc library objects
--------------------------------------------------
-if _OPTIONS["with-system-utf8proc"] ~= "0" then
+if _OPTIONS["with-system-utf8proc"] ~= "1" then
project "utf8proc"
uuid "1f881f09-0395-4483-ac37-2935fb092187"
kind "StaticLib"
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 81c6fc7a3c3..52ce322ffc2 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -26,7 +26,7 @@ project "utils"
ext_includedir("utf8proc"),
}
-if not _OPTIONS["with-system-utf8proc"] then
+if _OPTIONS["with-system-utf8proc"] ~= "1" then
defines {
"UTF8PROC_STATIC",
}