Merge pull request #155 from Faless/bump/libdatachannel_0.22.2

Update to libdatachannel 0.22.2

.github/actions/godot-cache/action.yml

@@ -0,0 +1,22 @@
+name: Setup Godot build cache
+description: Setup Godot build cache.
+inputs:
+  cache-name:
+    description: The cache base name (job name by default).
+    default: "${{github.job}}"
+  scons-cache:
+    description: The scons cache path.
+    default: "${{github.workspace}}/.scons-cache/"
+runs:
+  using: "composite"
+  steps:
+    # Upload cache on completion and check it out now
+    - name: Load .scons_cache directory
+      uses: actions/cache@v4
+      with:
+        path: ${{inputs.scons-cache}}
+        key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+        restore-keys: |
+          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
+          ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}

.github/workflows/build_release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
@@ -64,37 +64,51 @@ jobs:
             arch: 'x86_64'
             gdnative_flags: 'ios_arch=x86_64'
             sconsflags: 'ios_simulator=true'
-            os: 'macos-11'
+            os: 'macos-latest'
             cache-name: ios-x86_64-simulator
           - platform: ios
             arch: 'arm64'
             gdnative_flags: 'ios_arch=arm64'
             sconsflags: ''
-            os: 'macos-11'
+            os: 'macos-latest'
             cache-name: ios-arm64
 
           # Linux
           - platform: linux
             arch: 'x86_32'
-            buildroot: 'i686'
+            buildroot: 'i686-godot-linux-gnu_sdk-buildroot'
             gdnative_flags: 'bits=32'
             sconsflags: ''
             os: 'ubuntu-20.04'
             cache-name: linux-x86_32
           - platform: linux
             arch: 'x86_64'
-            buildroot: 'x86_64'
+            buildroot: 'x86_64-godot-linux-gnu_sdk-buildroot'
             gdnative_flags: 'bits=64'
             sconsflags: ''
             os: 'ubuntu-20.04'
             cache-name: linux-x86_64
+          - platform: linux
+            arch: 'arm32'
+            buildroot: 'arm-godot-linux-gnueabihf_sdk-buildroot'
+            gdnative_flags: 'bits=32'
+            sconsflags: ''
+            os: 'ubuntu-20.04'
+            cache-name: linux-arm32
+          - platform: linux
+            arch: 'arm64'
+            buildroot: 'aarch64-godot-linux-gnu_sdk-buildroot'
+            gdnative_flags: 'bits=64'
+            sconsflags: ''
+            os: 'ubuntu-20.04'
+            cache-name: linux-arm64
 
           # macOS
           - platform: macos
             arch: 'universal'
             gdnative_flags: 'macos_arch=universal bits=64'
             sconsflags: ''
-            os: 'macos-11'
+            os: 'macos-latest'
             cache-name: macos-universal
 
           # Windows
@@ -115,19 +129,19 @@ jobs:
 
     env:
       SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
-      SCONSFLAGS: ${{ matrix.sconsflags }} platform=${{ matrix.platform }} arch=${{ matrix.arch }} --jobs=2
+      SCONSFLAGS: ${{ matrix.sconsflags }} platform=${{ matrix.platform }} arch=${{ matrix.arch }} build_profile=build_profile.json --jobs=2
 
     defaults:
       run:
         shell: bash
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup Godot build cache
-        uses: ./godot-cpp/.github/actions/godot-cache
+        uses: ./.github/actions/godot-cache
         with:
           cache-name: ${{ matrix.cache-name }}
         continue-on-error: true
@@ -144,28 +158,22 @@ jobs:
           dpkg -l | grep ii | grep mingw
           update-alternatives --get-selections | grep mingw
 
-      - name: Setup Linux buildroot toolchain cache
-        if: ${{ matrix.platform == 'linux' }}
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ matrix.buildroot }}-godot-linux-gnu_sdk-buildroot.tar.bz2
-          key: linux-${{ matrix.buildroot }}-buildroot
-
       - name: Install Linux build dependencies
         if: ${{ matrix.platform == 'linux' }}
         run: |
           sudo apt-get update
           sudo apt-get install build-essential gcc-multilib g++-multilib wget
-          if [ ! -f ${{ matrix.buildroot }}-godot-linux-gnu_sdk-buildroot.tar.bz2 ]; then
-            wget https://downloads.tuxfamily.org/godotengine/toolchains/linux/${{ matrix.buildroot }}-godot-linux-gnu_sdk-buildroot.tar.bz2
-          fi
-          tar -xjf ${{ matrix.buildroot }}-godot-linux-gnu_sdk-buildroot.tar.bz2
-          echo "$GITHUB_WORKSPACE/${{ matrix.buildroot }}-godot-linux-gnu_sdk-buildroot/bin" >> $GITHUB_PATH
-          patch -p1 < misc/patches/scons_path.diff
+
+      - name: Setup Linux buildroot toolchain cache
+        if: ${{ matrix.platform == 'linux' }}
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ matrix.buildroot }}.tar.bz2
+          key: linux-${{ matrix.buildroot }}-buildroot
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           architecture: 'x64'
@@ -174,6 +182,28 @@ jobs:
         run: |
           python -c "import sys; print(sys.version)"
           python -m pip install scons
+
+      - name: Setup Linux toolchains
+        if: ${{ matrix.platform == 'linux' }}
+        run: |
+          if [ ! -f ${{ matrix.buildroot }}.tar.bz2 ]; then
+            wget https://downloads.tuxfamily.org/godotengine/toolchains/linux/${{ matrix.buildroot }}.tar.bz2
+          fi
+          tar -xjf ${{ matrix.buildroot }}.tar.bz2
+          ${{ matrix.buildroot }}/relocate-sdk.sh
+          echo "$GITHUB_WORKSPACE/${{ matrix.buildroot }}/bin" >> $GITHUB_PATH
+          echo "PKG_CONFIG=$GITHUB_WORKSPACE/${{ matrix.buildroot }}/share/pkgconfig/" >> $GITHUB_ENV
+          patch -p1 < misc/patches/scons_path.diff
+          patch -p1 < misc/patches/gdnantive_arm_warnings.diff
+
+      - name: Patch godot-cpp to support build profile.
+        run: |
+          patch -p1 < misc/patches/build_profile.diff
+          patch -p1 < misc/patches/build_profile_4.0.diff
+          patch -p1 < misc/patches/build_profile_3.x.diff
+
+      - name: Print tools versions
+        run: |
           python --version
           scons --version
           cmake --version
@@ -198,7 +228,7 @@ jobs:
         run: |
           scons target=release generate_bindings=yes ${{ matrix.gdnative_flags }} godot_version=3
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.job }}-${{ matrix.platform }}-${{ matrix.arch }}
           path: |
@@ -210,11 +240,11 @@ jobs:
     needs: build
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
 
@@ -241,17 +271,17 @@ jobs:
 
           ls -R release
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: godot-webrtc-extension-4.1
           path: release/*-extension-4.1-*.zip
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: godot-webrtc-extension-4.0
           path: release/*-extension-4.0-*.zip
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: godot-webrtc-gdnative
           path: release/*-gdnative-*.zip

SConstruct

@@ -12,41 +12,63 @@ def add_sources(sources, dirpath, extension):
 
 def replace_flags(flags, replaces):
     for k, v in replaces.items():
-        if k in flags:
+        if k not in flags:
+            continue
+        if v is None:
+            flags.remove(k)
+        else:
             flags[flags.index(k)] = v
 
 
+def validate_godotcpp_dir(key, val, env):
+    normalized = val if os.path.isabs(val) else os.path.join(env.Dir("#").abspath, val)
+    if not os.path.isdir(normalized):
+        raise UserError("GDExtension directory ('%s') does not exist: %s" % (key, val))
+
+
 env = Environment()
 opts = Variables(["customs.py"], ARGUMENTS)
 opts.Add(EnumVariable("godot_version", "The Godot target version", "4.1", ["3", "4.0", "4.1"]))
+opts.Add(
+    PathVariable(
+        "godot_cpp",
+        "Path to the directory containing Godot CPP folder",
+        None,
+        validate_godotcpp_dir,
+    )
+)
 opts.Update(env)
 
 # Minimum target platform versions.
 if "ios_min_version" not in ARGUMENTS:
-    ARGUMENTS["ios_min_version"] = "11.0"
+    ARGUMENTS["ios_min_version"] = "12.0"
 if "macos_deployment_target" not in ARGUMENTS:
     ARGUMENTS["macos_deployment_target"] = "11.0"
 if "android_api_level" not in ARGUMENTS:
     ARGUMENTS["android_api_level"] = "28"
 
+# Recent godot-cpp versions disables exceptions by default, but libdatachannel requires them.
+ARGUMENTS["disable_exceptions"] = "no"
+
 if env["godot_version"] == "3":
     if "platform" in ARGUMENTS and ARGUMENTS["platform"] == "macos":
         ARGUMENTS["platform"] = "osx"  # compatibility with old osx name
 
-    env = SConscript("godot-cpp-3.x/SConstruct")
+    sconstruct = env.get("godot_cpp", "godot-cpp-3.x") + "/SConstruct"
+    cpp_env = SConscript(sconstruct)
 
     # Patch base env
     replace_flags(
-        env["CCFLAGS"],
+        cpp_env["CCFLAGS"],
         {
-            "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0",
-            "-miphoneos-version-min=10.0": "-miphoneos-version-min=11.0",
+            "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=12.0",
+            "-miphoneos-version-min=10.0": "-miphoneos-version-min=12.0",
             "/std:c++14": "/std:c++17",
             "-std=c++14": "-std=c++17",
         },
     )
 
-    env = env.Clone()
+    env = cpp_env.Clone()
 
     if env["target"] == "debug":
         env.Append(CPPDEFINES=["DEBUG_ENABLED"])
@@ -60,11 +82,11 @@ if env["godot_version"] == "3":
         env["CC"] = "clang"  # CC is not set in 3.x and can result in it being "gcc".
 
     if env["platform"] == "ios":
-        env["ios_min_version"] = "11.0"
+        env["ios_min_version"] = "12.0"
 
     # Normalize suffix
     if env["platform"] in ["windows", "linux"]:
-        env["arch"] = "x86_32" if env["bits"] == "32" else "x86_64"
+        env["arch"] = ARGUMENTS.get("arch", "x86_32" if env["bits"] == "32" else "x86_64")
         env["arch_suffix"] = env["arch"]
     elif env["platform"] == "macos":
         env["arch"] = env["macos_arch"]
@@ -96,10 +118,23 @@ if env["godot_version"] == "3":
         elif not env["use_mingw"]:
             # Mark as MSVC build (would have failed to build the library otherwise).
             env["is_msvc"] = True
+    # Some linux specific hacks to allow cross-compiling for non-x86 machines.
+    if env["platform"] == "linux" and env["arch"] not in ("x86_32", "x86_64"):
+        for flags in (env["CCFLAGS"], env["LINKFLAGS"], cpp_env["CCFLAGS"], cpp_env["LINKFLAGS"]):
+            replace_flags(flags, {"-m32": None, "-m64": None})
 elif env["godot_version"] == "4.0":
-    env = SConscript("godot-cpp-4.0/SConstruct").Clone()
+    sconstruct = env.get("godot_cpp", "godot-cpp-4.0") + "/SConstruct"
+    cpp_env = SConscript(sconstruct)
+    env = cpp_env.Clone()
 else:
-    env = SConscript("godot-cpp/SConstruct").Clone()
+    sconstruct = env.get("godot_cpp", "godot-cpp") + "/SConstruct"
+    cpp_env = SConscript(sconstruct)
+    env = cpp_env.Clone()
+
+if cpp_env.get("is_msvc", False):
+    # Make sure we don't build with static cpp on MSVC (default in recent godot-cpp versions).
+    replace_flags(env["CCFLAGS"], {"/MT": "/MD"})
+    replace_flags(cpp_env["CCFLAGS"], {"/MT": "/MD"})
 
 # Should probably go to upstream godot-cpp.
 # We let SCons build its default ENV as it includes OS-specific things which we don't

build_profile.json

@@ -0,0 +1,11 @@
+{
+	"enabled_classes": [
+		"WebRTCDataChannelExtension",
+		"WebRTCPeerConnectionExtension",
+		"WebRTCDataChannelGDNative",
+		"WebRTCPeerConnectionGDNative",
+		"NativeScript",
+		"GDNativeLibrary",
+		"Window"
+	]
+}

misc/patches/build_profile.diff

@@ -0,0 +1,238 @@
+diff --git a/godot-cpp/SConstruct b/godot-cpp/SConstruct
+index 42f8fc0..9d59d1f 100644
+--- a/godot-cpp/SConstruct
++++ b/godot-cpp/SConstruct
+@@ -121,6 +121,14 @@ opts.Add(
+     BoolVariable("generate_bindings", "Force GDExtension API bindings generation. Auto-detected by default.", False)
+ )
+ opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
++opts.Add(
++    PathVariable(
++        "build_profile",
++        "Path to a file containing a feature build profile",
++        default=env.get("build_profile", None),
++        validator=lambda key, val, env: os.path.isfile(normalize_path(val)),
++    )
++)
+ 
+ opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
+ opts.Add(EnumVariable("precision", "Set the floating-point precision level", "single", ("single", "double")))
+diff --git a/godot-cpp/binding_generator.py b/godot-cpp/binding_generator.py
+index d04c698..41cf29b 100644
+--- a/godot-cpp/binding_generator.py
++++ b/godot-cpp/binding_generator.py
+@@ -70,12 +70,14 @@ def generate_wrappers(target):
+         f.write(txt)
+ 
+ 
+-def get_file_list(api_filepath, output_dir, headers=False, sources=False):
++def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+     api = {}
+     files = []
+     with open(api_filepath, encoding="utf-8") as api_file:
+         api = json.load(api_file)
+ 
++    build_profile = parse_build_profile(profile_filepath, api)
++
+     core_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp" / "core"
+     include_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp"
+     source_gen_folder = Path(output_dir) / "gen" / "src"
+@@ -104,7 +106,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+         source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
+         if headers:
+             files.append(str(header_filename.as_posix()))
+-        if sources:
++        if sources and is_class_included(engine_class["name"], build_profile):
+             files.append(str(source_filename.as_posix()))
+ 
+     for native_struct in api["native_structures"]:
+@@ -134,14 +136,107 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+     return files
+ 
+ 
+-def print_file_list(api_filepath, output_dir, headers=False, sources=False):
++def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+     end = ";"
+-    for f in get_file_list(api_filepath, output_dir, headers, sources):
++    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
+         print(f, end=end)
+ 
+ 
++def parse_build_profile(profile_filepath, api):
++    if profile_filepath == "":
++        return {}
++    print("Using feature build profile: " + profile_filepath)
++
++    with open(profile_filepath, encoding="utf-8") as profile_file:
++        profile = json.load(profile_file)
++
++    api_dict = {}
++    parents = {}
++    children = {}
++    for engine_class in api["classes"]:
++        api_dict[engine_class["name"]] = engine_class
++        parent = engine_class.get("inherits", "")
++        child = engine_class["name"]
++        parents[child] = parent
++        if parent == "":
++            continue
++        children[parent] = children.get(parent, [])
++        children[parent].append(child)
++
++    # Parse methods dependencies
++    deps = {}
++    reverse_deps = {}
++    for name, engine_class in api_dict.items():
++        ref_cls = set()
++        for method in engine_class.get("methods", []):
++            rtype = method.get("return_value", {}).get("type", "")
++            args = [a["type"] for a in method.get("arguments", [])]
++            if rtype in api_dict:
++                ref_cls.add(rtype)
++            elif is_enum(rtype) and get_enum_class(rtype) in api_dict:
++                ref_cls.add(get_enum_class(rtype))
++            for arg in args:
++                if arg in api_dict:
++                    ref_cls.add(arg)
++                elif is_enum(arg) and get_enum_class(arg) in api_dict:
++                    ref_cls.add(get_enum_class(arg))
++        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
++        for acls in ref_cls:
++            if acls == name:
++                continue
++            reverse_deps[acls] = reverse_deps.get(acls, set())
++            reverse_deps[acls].add(name)
++
++    included = []
++    front = list(profile.get("enabled_classes", []))
++    if front:
++        # These must always be included
++        front.append("WorkerThreadPool")
++        front.append("ClassDB")
++        front.append("ClassDBSingleton")
++    while front:
++        cls = front.pop()
++        if cls in included:
++            continue
++        included.append(cls)
++        parent = parents.get(cls, "")
++        if parent:
++            front.append(parent)
++        for rcls in deps.get(cls, set()):
++            if rcls in included or rcls in front:
++                continue
++            front.append(rcls)
++
++    excluded = []
++    front = list(profile.get("disabled_classes", []))
++    while front:
++        cls = front.pop()
++        if cls in excluded:
++            continue
++        excluded.append(cls)
++        front += children.get(cls, [])
++        for rcls in reverse_deps.get(cls, set()):
++            if rcls in excluded or rcls in front:
++                continue
++            front.append(rcls)
++
++    if included and excluded:
++        print(
++            "WARNING: Cannot specify both 'enabled_classes' and 'disabled_classes' in build profile. 'disabled_classes' will be ignored."
++        )
++
++    return {
++        "enabled_classes": included,
++        "disabled_classes": excluded,
++    }
++
++
+ def scons_emit_files(target, source, env):
+-    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath and not Path(profile_filepath).is_absolute():
++        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
++
++    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
+     env.Clean(target, files)
+     env["godot_cpp_gen_dir"] = target[0].abspath
+     return files, source
+@@ -154,11 +249,12 @@ def scons_generate_bindings(target, source, env):
+         "32" if "32" in env["arch"] else "64",
+         env["precision"],
+         env["godot_cpp_gen_dir"],
++        env.get("build_profile", ""),
+     )
+     return None
+ 
+ 
+-def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir="."):
++def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir=".", profile_filepath=""):
+     api = None
+ 
+     target_dir = Path(output_dir) / "gen"
+@@ -175,7 +271,7 @@ def generate_bindings(api_filepath, use_template_get_node, bits="64", precision=
+     generate_global_constants(api, target_dir)
+     generate_global_constant_binds(api, target_dir)
+     generate_builtin_bindings(api, target_dir, real_t + "_" + bits)
+-    generate_engine_classes_bindings(api, target_dir, use_template_get_node)
++    generate_engine_classes_bindings(api, target_dir, use_template_get_node, profile_filepath)
+     generate_utility_functions(api, target_dir)
+ 
+ 
+@@ -1023,7 +1119,7 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
+     return "\n".join(result)
+ 
+ 
+-def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
++def generate_engine_classes_bindings(api, output_dir, use_template_get_node, profile_filepath=""):
+     global engine_classes
+     global singletons
+     global native_structures
+@@ -1161,7 +1257,7 @@ def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
+ 
+     register_engine_classes_filename = Path(output_dir) / "src" / "register_engine_classes.cpp"
+     with register_engine_classes_filename.open("w+", encoding="utf-8") as source_file:
+-        source_file.write(generate_register_engine_classes_source(api))
++        source_file.write(generate_register_engine_classes_source(api, profile_filepath))
+ 
+     for native_struct in api["native_structures"]:
+         struct_name = native_struct["name"]
+@@ -1585,12 +1681,14 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
+     return "\n".join(result)
+ 
+ 
+-def generate_register_engine_classes_source(api):
++def generate_register_engine_classes_source(api, profile_filepath=""):
+     includes = []
+     registrations = []
+ 
++    build_profile = parse_build_profile(profile_filepath, api)
++
+     for class_api in api["classes"]:
+-        if class_api["name"] == "ClassDB":
++        if class_api["name"] == "ClassDB" or not is_class_included(class_api["name"], build_profile):
+             continue
+ 
+         class_name = class_api["name"]
+@@ -2066,6 +2164,20 @@ def is_pod_type(type_name):
+     ]
+ 
+ 
++def is_class_included(class_name, build_profile):
++    """
++    Check if an engine class should be included.
++    This removes classes according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    if included:
++        return class_name in included
++    if excluded:
++        return class_name not in excluded
++    return True
++
++
+ def is_included_type(type_name):
+     # Types which we already have implemented.
+     return is_included_struct_type(type_name) or type_name in ["ObjectID"]

misc/patches/build_profile_3.x.diff

@@ -0,0 +1,196 @@
+diff --git a/godot-cpp-3.x/SConstruct b/godot-cpp-3.x/SConstruct
+index f653d54..44f66a5 100644
+--- a/godot-cpp-3.x/SConstruct
++++ b/godot-cpp-3.x/SConstruct
+@@ -170,6 +170,14 @@ opts.Add(
+         True,
+     )
+ )
++opts.Add(
++    PathVariable(
++        "build_profile",
++        "Path to a file containing a feature build profile",
++        default=env.get("build_profile", None),
++        validator=lambda key, val, env: val if os.path.isabs(val) else os.path.join(env.Dir("#").abspath, val),
++    )
++)
+ 
+ opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
+ 
+diff --git a/godot-cpp-3.x/binding_generator.py b/godot-cpp-3.x/binding_generator.py
+index da4bb61..e5bd040 100644
+--- a/godot-cpp-3.x/binding_generator.py
++++ b/godot-cpp-3.x/binding_generator.py
+@@ -12,14 +12,115 @@ def correct_method_name(method_list):
+             method["name"] = "get_node_internal"
+ 
+ 
++def is_class_included(class_name, build_profile):
++    """
++    Check if an engine class should be included.
++    This removes classes according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    if included:
++        return class_name in included
++    if excluded:
++        return class_name not in excluded
++    return True
++
++
++def parse_build_profile(profile_filepath, api):
++    if profile_filepath == "":
++        return {}
++    print("Using feature build profile: " + profile_filepath)
++
++    with open(profile_filepath, encoding="utf-8") as profile_file:
++        profile = json.load(profile_file)
++
++    api_dict = {}
++    parents = {}
++    children = {}
++    for engine_class in api:
++        api_dict[engine_class["name"]] = engine_class
++        parent = engine_class.get("base_class", "")
++        child = engine_class["name"]
++        parents[child] = parent
++        if parent == "":
++            continue
++        children[parent] = children.get(parent, [])
++        children[parent].append(child)
++
++    # Parse methods dependencies
++    deps = {}
++    reverse_deps = {}
++    for name, engine_class in api_dict.items():
++        ref_cls = set()
++        for method in engine_class.get("methods", []):
++            rtype = method.get("return_value", {}).get("type", "")
++            args = [a["type"] for a in method.get("arguments", [])]
++            if rtype in api_dict:
++                ref_cls.add(rtype)
++            for arg in args:
++                if arg in api_dict:
++                    ref_cls.add(arg)
++        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
++        for acls in ref_cls:
++            if acls == name:
++                continue
++            reverse_deps[acls] = reverse_deps.get(acls, set())
++            reverse_deps[acls].add(name)
++
++    included = []
++    front = list(profile.get("enabled_classes", []))
++    if front:
++        # These must always be included
++        front.append("ConfigFile")
++        front.append("ClassDB")
++    while front:
++        cls = front.pop()
++        if cls in included:
++            continue
++        included.append(cls)
++        parent = parents.get(cls, "")
++        if parent:
++            front.append(parent)
++        for rcls in deps.get(cls, set()):
++            if rcls in included or rcls in front:
++                continue
++            front.append(rcls)
++
++    excluded = []
++    front = list(profile.get("disabled_classes", []))
++    while front:
++        cls = front.pop()
++        if cls in excluded:
++            continue
++        excluded.append(cls)
++        front += children.get(cls, [])
++        for rcls in reverse_deps.get(cls, set()):
++            if rcls in excluded or rcls in front:
++                continue
++            front.append(rcls)
++
++    if included and excluded:
++        print(
++            "WARNING: Cannot specify both 'enabled_classes' and 'disabled_classes' in build profile. 'disabled_classes' will be ignored."
++        )
++
++    return {
++        "enabled_classes": included,
++        "disabled_classes": excluded,
++    }
++
++
+ classes = []
+ 
+ 
+-def get_file_list(api_filepath, output_dir, headers=False, sources=False):
++def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+     global classes
++
+     files = []
+     with open(api_filepath) as api_file:
+         classes = json.load(api_file)
++        build_profile = parse_build_profile(profile_filepath, classes)
++
+     include_gen_folder = Path(output_dir) / "include" / "gen"
+     source_gen_folder = Path(output_dir) / "src" / "gen"
+     for _class in classes:
+@@ -27,7 +128,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+         source_filename = source_gen_folder / (strip_name(_class["name"]) + ".cpp")
+         if headers:
+             files.append(str(header_filename.as_posix()))
+-        if sources:
++        if sources and is_class_included(_class["name"], build_profile):
+             files.append(str(source_filename.as_posix()))
+     icall_header_filename = include_gen_folder / "__icalls.hpp"
+     register_types_filename = source_gen_folder / "__register_types.cpp"
+@@ -40,27 +141,32 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+     return files
+ 
+ 
+-def print_file_list(api_filepath, output_dir, headers=False, sources=False):
+-    for f in get_file_list(api_filepath, output_dir, headers, sources):
++def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
++    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
+         print(f, end=";")
+ 
+ 
+ def scons_emit_files(target, source, env):
+-    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath and not Path(profile_filepath).is_absolute():
++        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
++
++    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
+     env.Clean(target, files)
+     env["godot_cpp_gen_dir"] = target[0].abspath
+     return files, source
+ 
+ 
+ def scons_generate_bindings(target, source, env):
+-    generate_bindings(str(source[0]), env["generate_template_get_node"], env["godot_cpp_gen_dir"])
++    generate_bindings(str(source[0]), env["generate_template_get_node"], env["godot_cpp_gen_dir"], env["build_profile"])
+     return None
+ 
+ 
+-def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
++def generate_bindings(api_filepath, use_template_get_node, output_dir=".", profile_filepath=""):
+     global classes
+     with open(api_filepath) as api_file:
+         classes = json.load(api_file)
++        build_profile = parse_build_profile(profile_filepath, classes)
+ 
+     icalls = set()
+     include_gen_folder = Path(output_dir) / "include" / "gen"
+@@ -97,7 +203,7 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
+ 
+     init_method_bindings_filename = source_gen_folder / "__init_method_bindings.cpp"
+     with init_method_bindings_filename.open("w+") as init_method_bindings_file:
+-        init_method_bindings_file.write(generate_init_method_bindings(classes))
++        init_method_bindings_file.write(generate_init_method_bindings(list(filter(lambda x: is_class_included(x["name"], build_profile), classes))))
+ 
+ 
+ def is_reference_type(t):

misc/patches/build_profile_4.0.diff

@@ -0,0 +1,180 @@
+diff --git a/godot-cpp-4.0/SConstruct b/godot-cpp-4.0/SConstruct
+index 27ee137..ec2af72 100644
+--- a/godot-cpp-4.0/SConstruct
++++ b/godot-cpp-4.0/SConstruct
+@@ -119,6 +119,14 @@ opts.Add(
+ opts.Add(
+     BoolVariable("generate_bindings", "Force GDExtension API bindings generation. Auto-detected by default.", False)
+ )
++opts.Add(
++    PathVariable(
++        "build_profile",
++        "Path to a file containing a feature build profile",
++        default=env.get("build_profile", None),
++        validator=lambda key, val, env: os.path.isfile(normalize_path(val)),
++    )
++)
+ opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
+ 
+ opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
+diff --git a/godot-cpp-4.0/binding_generator.py b/godot-cpp-4.0/binding_generator.py
+index 7634942..7ab51a5 100644
+--- a/godot-cpp-4.0/binding_generator.py
++++ b/godot-cpp-4.0/binding_generator.py
+@@ -70,12 +70,14 @@ def generate_wrappers(target):
+         f.write(txt)
+ 
+ 
+-def get_file_list(api_filepath, output_dir, headers=False, sources=False):
++def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+     api = {}
+     files = []
+     with open(api_filepath) as api_file:
+         api = json.load(api_file)
+ 
++    build_profile = parse_build_profile(profile_filepath, api)
++
+     core_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp" / "core"
+     include_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp"
+     source_gen_folder = Path(output_dir) / "gen" / "src"
+@@ -104,7 +106,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+         source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
+         if headers:
+             files.append(str(header_filename.as_posix()))
+-        if sources:
++        if sources and is_class_included(engine_class["name"], build_profile):
+             files.append(str(source_filename.as_posix()))
+ 
+     for native_struct in api["native_structures"]:
+@@ -132,14 +134,107 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+     return files
+ 
+ 
+-def print_file_list(api_filepath, output_dir, headers=False, sources=False):
++def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+     end = ";"
+-    for f in get_file_list(api_filepath, output_dir, headers, sources):
++    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
+         print(f, end=end)
+ 
+ 
++def parse_build_profile(profile_filepath, api):
++    if profile_filepath == "":
++        return {}
++    print("Using feature build profile: " + profile_filepath)
++
++    with open(profile_filepath, encoding="utf-8") as profile_file:
++        profile = json.load(profile_file)
++
++    api_dict = {}
++    parents = {}
++    children = {}
++    for engine_class in api["classes"]:
++        api_dict[engine_class["name"]] = engine_class
++        parent = engine_class.get("inherits", "")
++        child = engine_class["name"]
++        parents[child] = parent
++        if parent == "":
++            continue
++        children[parent] = children.get(parent, [])
++        children[parent].append(child)
++
++    # Parse methods dependencies
++    deps = {}
++    reverse_deps = {}
++    for name, engine_class in api_dict.items():
++        ref_cls = set()
++        for method in engine_class.get("methods", []):
++            rtype = method.get("return_value", {}).get("type", "")
++            args = [a["type"] for a in method.get("arguments", [])]
++            if rtype in api_dict:
++                ref_cls.add(rtype)
++            elif is_enum(rtype) and get_enum_class(rtype) in api_dict:
++                ref_cls.add(get_enum_class(rtype))
++            for arg in args:
++                if arg in api_dict:
++                    ref_cls.add(arg)
++                elif is_enum(arg) and get_enum_class(arg) in api_dict:
++                    ref_cls.add(get_enum_class(arg))
++        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
++        for acls in ref_cls:
++            if acls == name:
++                continue
++            reverse_deps[acls] = reverse_deps.get(acls, set())
++            reverse_deps[acls].add(name)
++
++    included = []
++    front = list(profile.get("enabled_classes", []))
++    if front:
++        # These must always be included
++        front.append("WorkerThreadPool")
++        front.append("ClassDB")
++        front.append("ClassDBSingleton")
++    while front:
++        cls = front.pop()
++        if cls in included:
++            continue
++        included.append(cls)
++        parent = parents.get(cls, "")
++        if parent:
++            front.append(parent)
++        for rcls in deps.get(cls, set()):
++            if rcls in included or rcls in front:
++                continue
++            front.append(rcls)
++
++    excluded = []
++    front = list(profile.get("disabled_classes", []))
++    while front:
++        cls = front.pop()
++        if cls in excluded:
++            continue
++        excluded.append(cls)
++        front += children.get(cls, [])
++        for rcls in reverse_deps.get(cls, set()):
++            if rcls in excluded or rcls in front:
++                continue
++            front.append(rcls)
++
++    if included and excluded:
++        print(
++            "WARNING: Cannot specify both 'enabled_classes' and 'disabled_classes' in build profile. 'disabled_classes' will be ignored."
++        )
++
++    return {
++        "enabled_classes": included,
++        "disabled_classes": excluded,
++    }
++
++
+ def scons_emit_files(target, source, env):
+-    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath and not Path(profile_filepath).is_absolute():
++        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
++
++    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
+     env.Clean(target, files)
+     env["godot_cpp_gen_dir"] = target[0].abspath
+     return files, source
+@@ -1997,6 +2092,20 @@ def is_pod_type(type_name):
+     ]
+ 
+ 
++def is_class_included(class_name, build_profile):
++    """
++    Check if an engine class should be included.
++    This removes classes according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    if included:
++        return class_name in included
++    if excluded:
++        return class_name not in excluded
++    return True
++
++
+ def is_included_type(type_name):
+     # Types which we already have implemented.
+     return is_included_struct_type(type_name) or type_name in ["ObjectID"]

misc/patches/gdnantive_arm_warnings.diff

@@ -0,0 +1,34 @@
+diff --git a/godot-cpp-3.x/godot-headers/gdnative/gdnative.h b/godot-cpp-3.x/godot-headers/gdnative/gdnative.h
+index c0573d21b5d7a..ec95c4c4ebfcc 100644
+--- a/godot-cpp-3.x/godot-headers/gdnative/gdnative.h
++++ b/godot-cpp-3.x/godot-headers/gdnative/gdnative.h
+@@ -37,20 +37,24 @@ extern "C" {
+ 
+ #if defined(_WIN32) || defined(__ANDROID__)
+ #define GDCALLINGCONV
+-#define GDAPI GDCALLINGCONV
++
+ #elif defined(__APPLE__)
+ #include "TargetConditionals.h"
+ #if TARGET_OS_IPHONE
+ #define GDCALLINGCONV __attribute__((visibility("default")))
+-#define GDAPI GDCALLINGCONV
+ #elif TARGET_OS_MAC
+ #define GDCALLINGCONV __attribute__((sysv_abi))
+-#define GDAPI GDCALLINGCONV
+ #endif
+-#else // !_WIN32 && !__APPLE__
++
++#else // Linux/BSD/Web
++#if defined(__aarch64__) || defined(__arm__)
++#define GDCALLINGCONV
++#else
+ #define GDCALLINGCONV __attribute__((sysv_abi))
+-#define GDAPI GDCALLINGCONV
+ #endif
++#endif
++
++#define GDAPI GDCALLINGCONV
+ 
+ // This is for libraries *using* the header, NOT GODOT EXPOSING STUFF!!
+ #if !defined(GDN_EXPORT)

misc/scripts/file_format.sh

@@ -39,6 +39,8 @@ for f in "${files[@]}"; do
         continue
     elif [[ "$f" == "thirdparty/"* ]]; then
         continue
+    elif [[ "$f" == "misc/patches/"* ]]; then
+        continue
     elif [[ "$f" == *"/thirdparty/"* ]]; then
         continue
     elif [[ "$f" == "platform/android/java/lib/src/com/google"* ]]; then

misc/webrtc.tres

@@ -6,10 +6,14 @@ reloadable = false
 entry/OSX.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.macos.{TARGET}.universal.dylib"
 entry/Windows.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_64.dll"
 entry/Windows.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_32.dll"
-entry/X11.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
-entry/X11.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
-entry/Server.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
-entry/Server.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
+entry/X11.64.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
+entry/X11.32.x86_32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
+entry/X11.64.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.arm64.so"
+entry/X11.32.arm32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.arm32.so"
+entry/Server.64.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
+entry/Server.32.x86_32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
+entry/Server.64.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.arm64.so"
+entry/Server.32.arm32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.arm32.so"
 entry/Android.arm64-v8a = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.arm64.so"
 entry/Android.x64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.x86_64.so"
 entry/iOS.armv7 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.armv32.dylib"

src/WebRTCLibDataChannel.cpp

@@ -143,12 +143,12 @@ int32_t WebRTCLibDataChannel::_get_id() const {
 
 int32_t WebRTCLibDataChannel::_get_max_packet_life_time() const {
 	ERR_FAIL_COND_V(!channel, 0);
-	return channel->reliability().type == rtc::Reliability::Type::Timed ? std::get<std::chrono::milliseconds>(channel->reliability().rexmit).count() : -1;
+	return channel->reliability().maxPacketLifeTime.has_value() ? channel->reliability().maxPacketLifeTime.value().count() : -1;
 }
 
 int32_t WebRTCLibDataChannel::_get_max_retransmits() const {
 	ERR_FAIL_COND_V(!channel, 0);
-	return channel->reliability().type == rtc::Reliability::Type::Rexmit ? std::get<int>(channel->reliability().rexmit) : -1;
+	return channel->reliability().maxRetransmits.value_or(-1);
 }
 
 String WebRTCLibDataChannel::_get_protocol() const {

src/WebRTCLibPeerConnection.cpp

@@ -39,11 +39,31 @@ using namespace godot_webrtc;
 #define FAILED Error::FAILED
 #define ERR_UNCONFIGURED Error::ERR_UNCONFIGURED
 #define ERR_INVALID_PARAMETER Error::ERR_INVALID_PARAMETER
+#define VERBOSE_PRINT(str) Godot::print(str)
+#else
+#include <godot_cpp/variant/utility_functions.hpp>
+#define VERBOSE_PRINT(str) UtilityFunctions::print_verbose(str)
 #endif
+void LogCallback(rtc::LogLevel level, std::string message) {
+	switch (level) {
+		case rtc::LogLevel::Fatal:
+		case rtc::LogLevel::Error:
+			ERR_PRINT(message.c_str());
+			return;
+		case rtc::LogLevel::Warning:
+			WARN_PRINT(message.c_str());
+			return;
+		default:
+			VERBOSE_PRINT(message.c_str());
+			return;
+	}
+}
 
 void WebRTCLibPeerConnection::initialize_signaling() {
 #ifdef DEBUG_ENABLED
-	rtc::InitLogger(rtc::LogLevel::Debug);
+	rtc::InitLogger(rtc::LogLevel::Debug, LogCallback);
+#else
+	rtc::InitLogger(rtc::LogLevel::Warning, LogCallback);
 #endif
 }
 
@@ -96,11 +116,9 @@ Error WebRTCLibPeerConnection::_parse_channel_config(rtc::DataChannelInit &r_con
 	// Channels cannot be both time-constrained and retry-constrained.
 	ERR_FAIL_COND_V(p_dict.has("maxPacketLifeTime") && p_dict.has("maxRetransmits"), ERR_INVALID_PARAMETER);
 	if (p_dict.has("maxPacketLifeTime")) {
-		r_config.reliability.type = rtc::Reliability::Type::Timed;
-		r_config.reliability.rexmit = std::chrono::milliseconds(p_dict["maxPacketLifeTime"].operator int32_t());
+		r_config.reliability.maxPacketLifeTime = std::chrono::milliseconds(p_dict["maxPacketLifeTime"].operator int32_t());
 	} else if (p_dict.has("maxRetransmits")) {
-		r_config.reliability.type = rtc::Reliability::Type::Rexmit;
-		r_config.reliability.rexmit = p_dict["maxRetransmits"].operator int32_t();
+		r_config.reliability.maxRetransmits = p_dict["maxRetransmits"].operator int32_t();
 	}
 	if (p_dict.has("ordered") && p_dict["ordered"].operator bool() == false) {
 		r_config.reliability.unordered = true;

thirdparty/README.md

@@ -8,7 +8,7 @@ readability.
 ## json
 
 - Upstream: https://github.com/nlohmann/json
-- Version: 3.11.2 (bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d, 2022)
+- Version: 3.11.3 (9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03, 2023)
 - License: MIT
 
 Module location:
@@ -19,7 +19,7 @@ Module location:
 ## libdatachannel
 
 - Upstream: https://github.com/paullouisageneau/libdatachannel
-- Version: 0.19.4 (cb77870cde2c78007a336eae3aacd234dccda161, 2023)
+- Version: 0.22.2 (3c33ea0f49fff2630be080b2043052b4d3de5786, 2024)
 - License: MPL 2.0
 
 Module location:
@@ -30,7 +30,7 @@ Module location:
 # libjuice
 
 - Upstream: https://github.com/paullouisageneau/libjuice
-- Version: 1.3.3 (5f753cad49059cea4eb492eb5c11a3bbb4dd6324, 2023)
+- Version: 1.5.7 (70ba50cce33350b64404557ea63658e925758ce6, 2024)
 - License: MPL 2.0
 
 Module location:
@@ -52,7 +52,7 @@ Module location:
 ## openssl
 
 - Upstream: git://git.openssl.org/openssl.git
-- Version: 3.0.12 (c3cc0f1386b0544383a61244a4beeb762b67498f, 2023)
+- Version: 3.4.0 (98acb6b02839c609ef5b837794e08d906d965335, 2024)
 - License: Apache 2.0
 
 Module location:
@@ -74,7 +74,7 @@ Module location:
 ## usrsctp
 
 - Upstream: https://github.com/sctplab/usrsctp
-- Version: git (5ca29ac7d8055802c7657191325c06386640ac24, 2023)
+- Version: git (ebb18adac6501bad4501b1f6dccb67a1c85cc299, 2023)
 - License: BSD-3-Clause
 
 Module location:

tools/cmake.py

@@ -37,6 +37,8 @@ def cmake_default_flags(env):
         linux_flags = {
             "x86_64": "-m64",
             "x86_32": "-m32",
+            "arm32": "-march=armv7-a",
+            "arm64": "-march=armv8-a",
         }.get(env["arch"], "")
         if linux_flags:
             config["CMAKE_C_FLAGS"] = linux_flags
@@ -47,10 +49,9 @@ def cmake_default_flags(env):
             config["CMAKE_OSX_ARCHITECTURES"] = '"x86_64;arm64"'
         else:
             config["CMAKE_OSX_ARCHITECTURES"] = env["arch"]
-        if env["macos_deployment_target"] != "default":
+        if env.get("macos_deployment_target", "default") != "default":
             config["CMAKE_OSX_DEPLOYMENT_TARGET"] = env["macos_deployment_target"]
-
-        if env["platform"] == "macos" and sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ:
+        if sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ:
             config["CMAKE_AR"] = env["AR"]
             config["CMAKE_RANLIB"] = env["RANLIB"]
             if env["arch"] == "universal":

tools/openssl.py

@@ -32,8 +32,8 @@ def ssl_platform_target(env):
     elif platform == "ios":
         if env["ios_simulator"]:
             targets = {
-                "x86_64": "iossimulator-xcrun",
-                "arm64": "iossimulator-xcrun",
+                "x86_64": "iossimulator-x86_64-xcrun",
+                "arm64": "iossimulator-arm64-xcrun",
             }
         else:
             targets = {
@@ -79,7 +79,15 @@ def ssl_platform_flags(env):
         if env.get("android_api_level", ""):
             api = int(env["android_api_level"])
             args.append("-D__ANDROID_API__=%s" % api)
+    elif env["platform"] == "ios":
+        if env.get("ios_min_version", "default") != "default":
+            if env.get("ios_simulator", False):
+                args.append("-mios-simulator-version-min=%s" % env["ios_min_version"])
+            else:
+                args.append("-miphoneos-version-min=%s" % env["ios_min_version"])
     elif env["platform"] == "macos":
+        if env.get("macos_deployment_target", "default") != "default":
+            args.append("-mmacosx-version-min=%s" % env["macos_deployment_target"])
         # OSXCross toolchain setup.
         if sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ:
             for k in ["CC", "CXX", "AR", "AS", "RANLIB"]: