Catalyst upgrade

gistfile0.txt

diff --git a/platform/ios/detect.py b/platform/ios/detect.py
index c6c0db165d..e1fd924f80 100644
--- a/platform/ios/detect.py
+++ b/platform/ios/detect.py
@@ -67,7 +67,7 @@ def get_flags():
 
 def configure(env: "SConsEnvironment"):
     # Validate arch.
-    supported_arches = ["x86_64", "x86_64h", "arm64", "arm64h"]
+    supported_arches = ["x86_64", "x86_64h", "arm64", "arm64h", "x86_64_catalyst"]
     validate_arch(env["arch"], get_name(), supported_arches)
 
     ## LTO
@@ -111,6 +111,8 @@ def configure(env: "SConsEnvironment"):
 
     if env["arch"] == "x86_64h" or env["arch"] == "arm64h":
         catalyst_arch = env["arch"][:-1]
+    elif env["arch"] == "x86_64_catalyst":
+        catalyst_arch = "x86_64"
 
     ## Compile flags
 
@@ -120,28 +122,28 @@ def configure(env: "SConsEnvironment"):
         env.Append(CCFLAGS=["-mios-simulator-version-min=14.0"])
         env.Append(CPPDEFINES=["IOS_SIMULATOR"])
         env.extra_suffix = ".simulator" + env.extra_suffix
-    elif env["arch"] == "x86_64h" or env["arch"] == "arm64h":
+    elif env["arch"] == "x86_64h" or env["arch"] == "arm64h" or env["arch"] == "x86_64_catalyst":
         detect_darwin_sdk_path("macos", env)
         detect_darwin_sdk_path("ios", env)
         env.Append(
             ASFLAGS=[
                 "-arch",
                 catalyst_arch,
-                "--target=" + catalyst_arch + "-apple-ios15.0-macabi -mmacosx-version-min=10.13",
+                "--target=" + catalyst_arch + "-apple-ios18.0-macabi -mmacosx-version-min=15.5",
             ]
         )
         env.Append(
             CCFLAGS=[
                 "-arch",
                 catalyst_arch,
-                "--target=" + catalyst_arch + "-apple-ios15.0-macabi -mmacosx-version-min=10.13",
+                "--target=" + catalyst_arch + "-apple-ios18.0-macabi -mmacosx-version-min=15.5",
             ]
         )
         env.Append(
             LINKFLAGS=[
                 "-arch",
                 catalyst_arch,
-                "--target=" + catalyst_arch + "-apple-ios15.0-macabi -mmacosx-version-min=10.13",
+                "--target=" + catalyst_arch + "-apple-ios18.0-macabi -mmacosx-version-min=15.5",
             ]
         )
     else:
@@ -163,9 +165,9 @@ def configure(env: "SConsEnvironment"):
             ).split()
         )
         env.Append(ASFLAGS=["-arch", "x86_64"])
-    elif env["arch"] == "x86_64h" or env["arch"] == "arm64h":
+    elif env["arch"] == "x86_64h" or env["arch"] == "arm64h" or env["arch"] == "x86_64_catalyst":
         env.Append(CPPDEFINES=["CATALYST"])
-        env["ENV"]["MACOSX_DEPLOYMENT_TARGET"] = "10.9"
+        env["ENV"]["MACOSX_DEPLOYMENT_TARGET"] = "15.5"
         env.Append(
             CCFLAGS=(
                 "-fobjc-arc"
@@ -191,7 +193,7 @@ def configure(env: "SConsEnvironment"):
     # Temp fix for ABS/MAX/MIN macros in iOS SDK blocking compilation
     env.Append(CCFLAGS=["-Wno-ambiguous-macro"])
 
-    if not (env["arch"] == "x86_64h" or env["arch"] == "arm64h"):
+    if not (env["arch"] == "x86_64h" or env["arch"] == "arm64h" or env["arch"] == "x86_64_catalyst"):
         env.Prepend(
             CPPPATH=[
                 "$IOS_SDK_PATH/usr/include",
@@ -238,7 +240,7 @@ def configure(env: "SConsEnvironment"):
         if env["ios_simulator"]:
             extra_suffix = ".simulator"
 
-        if env["arch"] == "x86_64h" or env["arch"] == "arm64h":
+        if env["arch"] == "x86_64h" or env["arch"] == "arm64h" or env["arch"] == "x86_64_catalyst":
             env.Prepend(CPPPATH=["/usr/local/include"])
 
         if env["angle_libs"] != "":
diff --git a/platform_methods.py b/platform_methods.py
index e1cca9a6e4..93947b984a 100644
--- a/platform_methods.py
+++ b/platform_methods.py
@@ -20,6 +20,7 @@ architectures = [
     "x86_32",
     "x86_64",
     "x86_64h",
+    "x86_64_catalyst",
     "arm32",
     "arm64",
     "arm64h",