From 6eef5b2ef3bd9712f317e8b62471800df73e0326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 16 May 2024 10:48:00 +0200 Subject: [PATCH] Initial commit with submodule, osxcross compat patch, and CI setup --- .github/workflows/CI.yml | 149 ++++++++++++++++++ .gitmodules | 3 + LICENSE | 202 +++++++++++++++++++++++++ MoltenVK | 1 + README.md | 20 +++ patches/moltenvk-osxcross-compat.patch | 113 ++++++++++++++ 6 files changed, 488 insertions(+) create mode 100644 .github/workflows/CI.yml create mode 100644 .gitmodules create mode 100644 LICENSE create mode 160000 MoltenVK create mode 100644 README.md create mode 100644 patches/moltenvk-osxcross-compat.patch diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 0000000..13e3f86 --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,149 @@ +# Stripped down version of MoltenVK's CI script, +# only to make tagged releases with our patch. + +name: CI + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events + push: + pull_request: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +# See the following, which includes links to supported macOS versions, including supported Xcode versions +# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources +jobs: + build: + strategy: + matrix: + xcode: [ "15.0" ] + platform: [ "all" ] + os: [ "macos-13" ] + upload_artifacts: [ true ] + fail-fast: false + + name: 'MoltenVK (Xcode ${{ matrix.xcode }} - ${{ matrix.platform }})' + + runs-on: ${{ matrix.os }} + + env: + XCODE_DEV_PATH: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" + + defaults: + run: + working-directory: "MoltenVK" + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v4 + with: + submodules: 'true' + + # Python 3.12 removed distutils, which is used by glslang::update_glslang_sources.py called from fetchDependencies + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: Select Xcode version + run: sudo xcode-select -switch "${XCODE_DEV_PATH}" + + - name: Prep + id: prep + run: | + echo "Get Xcode version info" + XCODE_VERSION="$(xcodebuild -version)" + echo "${XCODE_VERSION}" + XCODE_VERSION="$(echo "${XCODE_VERSION}" | tr '\t\r\n ' '_')" + echo "${XCODE_VERSION}" + echo "XCODE_VERSION=${XCODE_VERSION}" >> $GITHUB_OUTPUT + + - name: Cache Dependencies + id: cache-dependencies + if: success() && !(github.event_name == 'push' && contains(github.ref, 'refs/tags/')) # never cache dependencies for pushed tags + uses: actions/cache@v3 + with: + path: | + External/build + !External/build/Intermediates + key: ${{ runner.os }}-${{ steps.prep.outputs.XCODE_VERSION }}-${{ matrix.platform }}-${{ hashFiles('fetchDependencies','ExternalRevisions/**','ExternalDependencies.xcodeproj/**','Scripts/**') }} + + - name: Disable ObjC MsgSend selector stubs for osxcross compatibility + run: | + patch -p1 < ../patches/moltenvk-osxcross-compat.patch + + - name: Fetch Dependencies (Use Built Cache) + if: steps.cache-dependencies.outputs.cache-hit == 'true' + run: | + ./fetchDependencies -v --none + + - name: Fetch Dependencies + run: | + ./fetchDependencies -v --${{ matrix.platform }} + + - name: Output Dependency Build Logs on Failure + if: failure() + run: cat "dependenciesbuild.log" + + - name: Build MoltenVK + run: | + make ${{ matrix.platform }} + + - name: Output MoltenVK Build Logs on Failure + if: failure() + run: | + if [ -f "xcodebuild.log" ]; then + cat "xcodebuild.log" + fi + + - name: Tar Artifacts + if: success() && matrix.upload_artifacts == true + # See: https://github.com/actions/upload-artifact#maintaining-file-permissions-and-case-sensitive-files + # To reduce artifact size, don't include any stand-alone shader converter binaries. + run: | + rm -rf Package/Release/MoltenVKShaderConverter + tar -C Package -s/Release/MoltenVK/ -cvf "MoltenVK-${{ matrix.platform }}.tar" Release/ + + - name: Upload Artifacts + if: success() && matrix.upload_artifacts == true + uses: actions/upload-artifact@v4 + with: + name: "MoltenVK-${{ matrix.platform }}" + path: "MoltenVK/MoltenVK-${{ matrix.platform }}.tar" + + release: + name: 'Release' + + needs: [build] + + runs-on: ubuntu-latest + + if: ${{ startsWith(github.ref, 'refs/tags/') }} + + permissions: + contents: write + + defaults: + run: + working-directory: "MoltenVK" + + steps: + - name: Download Artifacts + uses: actions/download-artifact@v4 + + - name: Create Release + uses: ncipollo/release-action@v1 + with: + # Allow updating existing releases if the workflow is triggered by release creation or re-run. + allowUpdates: true + # When the release is updated, delete the existing artifacts for replacement. + removeArtifacts: true + # If a release is being replaced, omit updating the name and body. + # Allows for creating a release and filling these in before the workflow runs. + # Then, the workflow will populate the release with the artifacts. + omitNameDuringUpdate: true + omitBodyDuringUpdate: true + # Upload all MoltenVK CI artifacts as release assets. + artifacts: "MoltenVK*/*" + artifactErrorsFailBuild: true diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f0c785b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "MoltenVK"] + path = MoltenVK + url = https://github.com/KhronosGroup/MoltenVK diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/MoltenVK b/MoltenVK new file mode 160000 index 0000000..bf097ed --- /dev/null +++ b/MoltenVK @@ -0,0 +1 @@ +Subproject commit bf097edc74ec3b6dfafdcd5a38d3ce14b11952d6 diff --git a/README.md b/README.md new file mode 100644 index 0000000..03c06d0 --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +# MoltenVK builds compatible with osxcross + +Official Khronos [MoltenVK releases](https://github.com/KhronosGroup/MoltenVK/releases/) +are incompatible with current osxcross versions due to Xcode automatically +using the `-fobjc-msgsend-selector-stubs` optimization. + +The linker used by osxcross doesn't seem to support these yet, even when +compiling against Apple LLVM. + +See this upstream issue for details: +- https://github.com/KhronosGroup/MoltenVK/issues/1756 + +This repository simply does it own builds of MoltenVK with these flags added to +disable the optimization: + +``` +-fno-objc-msgsend-selector-stubs -Wno-unused-command-line-argument +``` + +That's the only difference with Khronos' builds. diff --git a/patches/moltenvk-osxcross-compat.patch b/patches/moltenvk-osxcross-compat.patch new file mode 100644 index 0000000..47e3593 --- /dev/null +++ b/patches/moltenvk-osxcross-compat.patch @@ -0,0 +1,113 @@ +diff --git a/Makefile b/Makefile +index 5fe34950..e29d7f6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,7 @@ XC_SCHEME := MoltenVK Package + XCODEBUILD := set -o pipefail && $(shell command -v xcodebuild) + # Used to determine if xcpretty is available + XCPRETTY_PATH := $(shell command -v xcpretty 2> /dev/null) ++OTHER_CFLAGS := "-fno-objc-msgsend-selector-stubs -Wno-unused-command-line-argument" + + OUTPUT_FMT_CMD = + ifdef XCPRETTY_PATH +@@ -47,71 +48,71 @@ all-debug: + + .PHONY: macos + macos: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: macos-debug + macos-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: ios + ios: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: ios-debug + ios-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: iossim + iossim: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: iossim-debug + iossim-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (iOS only)" -destination "generic/platform=iOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: maccat + maccat: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (MacCat only)" -destination "generic/platform=macOS,variant=Mac Catalyst" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (MacCat only)" -destination "generic/platform=macOS,variant=Mac Catalyst" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: maccat-debug + maccat-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (MacCat only)" -destination "generic/platform=macOS,variant=Mac Catalyst" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (MacCat only)" -destination "generic/platform=macOS,variant=Mac Catalyst" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: tvos + tvos: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: tvos-debug + tvos-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: tvossim + tvossim: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: tvossim-debug + tvossim-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (tvOS only)" -destination "generic/platform=tvOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: visionos + visionos: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: visionos-debug + visionos-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: visionossim + visionossim: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS Simulator" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: visionossim-debug + visionossim-debug: +- $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) build -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (visionOS only)" -destination "generic/platform=xrOS Simulator" -configuration "Debug" GCC_PREPROCESSOR_DEFINITIONS='$${inherited} $(MAKEARGS)' OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + + .PHONY: clean + clean: +- $(XCODEBUILD) clean -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" $(OUTPUT_FMT_CMD) ++ $(XCODEBUILD) clean -project "$(XC_PROJ)" -scheme "$(XC_SCHEME) (macOS only)" -destination "generic/platform=macOS" OTHER_CFLAGS=$(OTHER_CFLAGS) $(OUTPUT_FMT_CMD) + rm -rf Package + + # Usually requires 'sudo make install' +diff --git a/fetchDependencies b/fetchDependencies +index a870c300..117329d5 100755 +--- a/fetchDependencies ++++ b/fetchDependencies +@@ -454,6 +454,7 @@ function build_impl() { + -enableThreadSanitizer "${XC_USE_TSAN}" \ + -enableUndefinedBehaviorSanitizer "${XC_USE_UBSAN}" \ + -derivedDataPath "${XC_LCL_DD_PATH}" \ ++ OTHER_CFLAGS="-fno-objc-msgsend-selector-stubs -Wno-unused-command-line-argument" \ + ${XC_BUILD_VERBOSITY} \ + build +