From f0bd3efbdf2ae6645dc33bd9a75d252654802cf0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Aug 2024 11:40:04 +0300
Subject: [PATCH] Add arm64 simulator target to iOS builds

---
 build-native.sh | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/build-native.sh b/build-native.sh
index cb8e0d0..fc4fa8e 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -64,15 +64,35 @@ if [[ $_OSDir == "ios" ]]; then
 
     popd
 
-    mkdir -p simulator-build
-    pushd simulator-build
+    mkdir -p simulator-build-arm64
+    pushd simulator-build-arm64
+
+    cmake ../../../.. -DIOS=ON -DCMAKE_BUILD_TYPE=$_CMakeBuildType $_CMakeGenerator -DPLATFORM=SIMULATORARM64 -DDEPLOYMENT_TARGET=13.4 $_CMakeEnableBitcode -DPYTHON_EXECUTABLE=$_PythonExePath -DCMAKE_OSX_ARCHITECTURES="$_CMakeOsxArchitectures"
+    cmake --build . --target $_CMakeBuildTarget $_CMakeExtraBuildArgs
+
+    popd
+
+    mkdir -p simulator-build-x64
+    pushd simulator-build-x64
 
     cmake ../../../.. -DIOS=ON -DCMAKE_BUILD_TYPE=$_CMakeBuildType $_CMakeGenerator -DPLATFORM=SIMULATOR64 -DDEPLOYMENT_TARGET=13.4 $_CMakeEnableBitcode -DPYTHON_EXECUTABLE=$_PythonExePath -DCMAKE_OSX_ARCHITECTURES="$_CMakeOsxArchitectures"
     cmake --build . --target $_CMakeBuildTarget $_CMakeExtraBuildArgs
 
     popd
 
-    xcodebuild -create-xcframework -framework ./device-build/Release-iphoneos/veldrid-spirv.framework -framework ./simulator-build/Release-iphonesimulator/veldrid-spirv.framework -output ./veldrid-spirv.xcframework
+    mkdir -p simulator-build-combined/veldrid-spirv.framework
+
+    cp ./simulator-build-arm64/Release-iphonesimulator/veldrid-spirv.framework/Info.plist ./simulator-build-combined/veldrid-spirv.framework/Info.plist
+
+    lipo -create \
+	    ./simulator-build-arm64/Release-iphonesimulator/veldrid-spirv.framework/veldrid-spirv \
+	    ./simulator-build-x64/Release-iphonesimulator/veldrid-spirv.framework/veldrid-spirv \
+	 -output ./simulator-build-combined/veldrid-spirv.framework/veldrid-spirv
+
+    xcodebuild -create-xcframework \
+	    -framework ./device-build/Release-iphoneos/veldrid-spirv.framework \
+	    -framework ./simulator-build-combined/veldrid-spirv.framework \
+	    -output ./veldrid-spirv.xcframework
 else
     cmake ../../.. -DCMAKE_BUILD_TYPE=$_CMakeBuildType $_CMakeGenerator $_CMakeEnableBitcode -DPYTHON_EXECUTABLE=$_PythonExePath -DCMAKE_OSX_ARCHITECTURES="$_CMakeOsxArchitectures"
     cmake --build . --target $_CMakeBuildTarget $_CMakeExtraBuildArgs