Merge branch 'master' into fully-packed-build

Author: Decapitated

SConstruct

@@ -56,7 +56,11 @@ if env["platform"] == "windows":
     env.Append(LIBPATH=["ultralight/lib/"])
 elif env["platform"] == "linux":
     env.Append(LIBPATH=["ultralight/bin/linux/"])
-elif env["platform"] == "macos" or env["platform"] == "ios":
+elif env["platform"] == "macos":
+    env.Append(LIBPATH=[f"ultralight/bin/macos/{env["arch"]}/"])
+    if env["arch"] == "arm64":
+        env.Append(LINKFLAGS=['-arch', 'arm64', '-rpath', os.path.abspath("ultralight/bin/macos/arm64/")])
+elif env["platform"] == "ios":
     filepath = "{}.framework/".format(env["platform"])
     file = "{}{}".format(libname, env["suffix"])
 
@@ -71,7 +75,7 @@ library = env.SharedLibrary(
     source=sources,
 )
 
-copy = env.InstallAs("{}/addons/{}/bin/{}/{}{}".format(projectdir, libname, env["platform"], filepath, file), library)
+copy = env.InstallAs("{}/addons/{}/bin/{}/{}/{}{}".format(projectdir, libname, env["platform"], env["arch"], filepath, file), library)
 
 default_args = [library, copy]
 Default(*default_args)
@@ -96,6 +100,16 @@ elif env["platform"] == "linux":
             "ultralight/bin/linux/libWebCore.so"
         ]
     ))
+elif env["platform"] == "macos":
+    Execute(Copy(
+        f"{projectdir}/addons/{libname}/bin/macos/{env["arch"]}/",
+        [
+            f"ultralight/bin/macos/{env["arch"]}/libAppCore.dylib",
+            f"ultralight/bin/macos/{env["arch"]}/libUltralight.dylib",
+            f"ultralight/bin/macos/{env["arch"]}/libUltralightCore.dylib",
+            f"ultralight/bin/macos/{env["arch"]}/libWebCore.dylib"
+        ]
+    ))
 
 Execute(Copy(
     f"{projectdir}/addons/{libname}/resources/",

demo/addons/gdhtml/gdhtml.gdextension

@@ -5,18 +5,18 @@ compatibility_minimum = "4.3"
 
 [dependencies]
 
-macos.debug = {
-    "bin/macos/libUltralight.dylib" : "",
-    "bin/macos/libUltralightCore.dylib" : "",
-    "bin/macos/libWebCore.dylib" : "",
-    "bin/macos/libAppCore.dylib" : "",
+macos.debug.arm64 = {
+    "bin/macos/arm64/libUltralight.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libUltralightCore.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libWebCore.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libAppCore.dylib" : "Contents/Frameworks",
 }
 
-macos.release = {
-    "bin/macos/libUltralight.dylib" : "",
-    "bin/macos/libUltralightCore.dylib" : "",
-    "bin/macos/libWebCore.dylib" : "",
-    "bin/macos/libAppCore.dylib" : "",
+macos.release.arm64 = {
+    "bin/macos/arm64/libUltralight.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libUltralightCore.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libWebCore.dylib" : "Contents/Frameworks",
+    "bin/macos/arm64/libAppCore.dylib" : "Contents/Frameworks",
 }
 
 windows.debug.x86_64 = {
@@ -49,8 +49,8 @@ linux.release.x86_64 = {
 
 [libraries]
 
-macos.debug = "bin/macos/gdhtml.macos.template_debug.framework"
-macos.release = "bin/macos/gdhtml.macos.template_release.framework"
+macos.debug.arm64 = "bin/macos/arm64/gdhtml.macos.template_debug.arm64.dylib"
+macos.release.arm64 = "bin/macos/arm64/gdhtml.macos.template_release.arm64.dylib"
 windows.debug.x86_64 = "bin/windows/gdhtml.windows.template_debug.x86_64.dll"
 windows.release.x86_64 = "bin/windows/gdhtml.windows.template_release.x86_64.dll"
 linux.debug.x86_64 = "bin/linux/gdhtml.linux.template_debug.x86_64.so"