Fix use xcframeworks for iOS builds

Author: gilzoide

.editorconfig

@@ -11,7 +11,11 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[Sconstruct]
+[*.py]
+indent_style = space
+indent_size = 4
+
+[SConstruct]
 indent_style = space
 indent_size = 4
 

.gitignore

@@ -15,6 +15,7 @@ build/*
 *.dll
 *.dylib
 *.framework
+*.xcframework
 compile_commands.json
 addons/objectivec-gdextension/LICENSE
 

SConstruct

@@ -1,40 +1,65 @@
-import os
-
 env = SConscript("lib/godot-cpp/SConstruct").Clone()
+env.Tool("apple", toolpath=["tools"])
 
 # Add support for generating compilation database files
 env.Tool("compilation_db")
 compiledb = env.CompilationDatabase("compile_commands.json")
 env.Alias("compiledb", compiledb)
 
+# Setup variant build dir for each setup
+def remove_prefix(s, prefix):
+    return s[len(prefix):] if s.startswith(prefix) else s
+
+build_dir = "build/{}".format(remove_prefix(env["suffix"], "."))
+VariantDir(build_dir, 'src', duplicate=False)
+
 if env["platform"] in ["macos", "ios"]:
     # Compile flags
     env.Append(LINKFLAGS="-framework Foundation")
 
-    # Setup variant build dir for each setup
-    def remove_prefix(s, prefix):
-        return s[len(prefix):] if s.startswith(prefix) else s
-
-    build_dir = "build/{}".format(remove_prefix(env["suffix"], "."))
-    VariantDir(build_dir, 'src', duplicate=False)
-
     # Build Objective-C GDExtension
     source_directories = ["."]
     sources = [
-        Glob("{}/{}/*.cpp".format(build_dir, directory)) + Glob("{}/{}/*.mm".format(build_dir, directory))
+        Glob(f"{build_dir}/{directory}/*.cpp") + Glob(f"{build_dir}/{directory}/*.mm")
         for directory in source_directories
     ]
-    library = env.SharedLibrary(
-        "addons/objc-gdextension/build/libobjcgdextension{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
-        source=sources,
-    )
+    if env["platform"] == "ios":
+        library = env.StaticLibrary(
+            f"{build_dir}/libobjcgdextension{env["suffix"]}{env["LIBSUFFIX"]}",
+            source=sources,
+        )
+        godotcpp_xcframework = env.XCFramework(
+            f"addons/objc-gdextension/build/libgodot-cpp{env["suffix"]}.xcframework",
+            [
+                f"lib/godot-cpp/bin/libgodot-cpp{env["suffix"]}{env["LIBSUFFIX"]}",
+                *map(str, Glob(f"lib/godot-cpp/bin/libgodot-cpp{env["suffix"]}*{env["LIBSUFFIX"]}")),
+            ],
+        )
+        luagdextension_xcframework = env.XCFramework(
+            f"addons/objc-gdextension/build/libobjcgdextension{env["suffix"]}.xcframework",
+            [
+                f"{build_dir}/libobjcgdextension{env["suffix"]}{env["LIBSUFFIX"]}",
+                *map(str, Glob(f"{build_dir}/libobjcgdextension{env["suffix"]}*{env["LIBSUFFIX"]}")),
+            ],
+        )
+        env.Depends(godotcpp_xcframework, library)
+        env.Depends(luagdextension_xcframework, godotcpp_xcframework)
+        Default(luagdextension_xcframework)
+    else:
+        library = env.SharedLibrary(
+            f"addons/objc-gdextension/build/libobjcgdextension{env["suffix"]}{env["SHLIBSUFFIX"]}",
+            source=sources,
+        )
 else:
     dummy_env = Environment(
         CPPPATH="lib/gdextension-lite",
         CFLAGS=["-flto", "-O2"],
     )
     library = dummy_env.SharedLibrary(
-        "addons/objc-gdextension/build/libobjcgdextension{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
-        source=["src/dummy_main.c", "lib/gdextension-lite/gdextension-lite/gdextension-lite-one.c"]
+        f"addons/objc-gdextension/build/libobjcgdextension{env["suffix"]}{env["SHLIBSUFFIX"]}",
+        source=[
+            "src/dummy_main.c",
+            "lib/gdextension-lite/gdextension-lite/gdextension-lite-one.c",
+        ]
     )
 Default(library)

addons/objc-gdextension/objcgdextension.gdextension

@@ -1,16 +1,14 @@
 [configuration]
-
 entry_symbol = "objcgdextension_entrypoint"
 compatibility_minimum = "4.1"
 
 [libraries]
-
 macos.debug = "build/libobjcgdextension.macos.template_debug.universal.dylib"
 macos.release = "build/libobjcgdextension.macos.template_release.universal.dylib"
-ios.debug = "build/libobjcgdextension.ios.template_debug.universal.dylib"
-ios.debug.simulator = "build/libobjcgdextension.ios.template_debug.universal.simulator.dylib"
-ios.release = "build/libobjcgdextension.ios.template_release.universal.dylib"
-ios.release.simulator = "build/libobjcgdextension.ios.template_release.universal.simulator.dylib"
+ios.debug = "build/libobjcgdextension.ios.template_debug.universal.xcframework"
+ios.debug.simulator = "build/libobjcgdextension.ios.template_debug.universal.simulator.xcframework"
+ios.release = "build/libobjcgdextension.ios.template_release.universal.xcframework"
+ios.release.simulator = "build/libobjcgdextension.ios.template_release.universal.simulator.xcframework"
 windows.x86_32 = "build/libobjcgdextension.windows.template_release.x86_32.dll"
 windows.x86_64 = "build/libobjcgdextension.windows.template_release.x86_64.dll"
 linux.x86_32 = "build/libobjcgdextension.linux.template_release.x86_32.so"
@@ -19,3 +17,17 @@ android.x86_32 = "build/libobjcgdextension.android.template_release.x86_32.so"
 android.x86_64 = "build/libobjcgdextension.android.template_release.x86_64.so"
 android.arm32 = "build/libobjcgdextension.android.template_release.arm32.so"
 android.arm64 = "build/libobjcgdextension.android.template_release.arm64.so"
+
+[dependencies]
+ios.debug = {
+  "build/libgodot-cpp.ios.template_debug.universal.xcframework": ""
+}
+ios.debug.simulator = {
+  "build/libgodot-cpp.ios.template_debug.universal.simulator.xcframework": ""
+}
+ios.release = {
+  "build/libgodot-cpp.ios.template_release.universal.xcframework": ""
+}
+ios.release.simulator = {
+  "build/libgodot-cpp.ios.template_release.universal.simulator.xcframework": ""
+}

tools/apple.py

@@ -0,0 +1,29 @@
+import sys
+
+
+def Lipo(env, target, source):
+    return env.Command(
+        target,
+        source,
+        action=f"lipo $SOURCES -create -output $TARGET",
+    )
+
+
+def XCFramework(env, target, source):
+    return env.Command(
+        target,
+        source,
+        action=[
+            "rm -rf $TARGET",
+            f"xcodebuild -create-xcframework {' '.join('-library ' + str(s) for s in source)} -output $TARGET",
+        ],
+    )
+
+
+def exists(env):
+    return sys.platform == "darwin"
+
+
+def generate(env):
+    env.AddMethod(Lipo, "Lipo")
+    env.AddMethod(XCFramework, "XCFramework")