Attempt to fix iOS issues

RavEngine · Oct 18, 2023 · 46ee9db · 46ee9db
1 parent 4268a3d
commit 46ee9db
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -100,7 +100,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-            tplatform: [OS64COMBINED, TVOSCOMBINED, SIMULATOR64, SIMULATOR_TVOS]
+            tplatform: [iOS, tvOS]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -110,7 +110,7 @@ jobs:
         run: |
             mkdir build
             cd build
-            cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE="../config/ios.toolchain.cmake" -DENABLE_ARC=OFF -DPLATFORM="${{ matrix.tplatform }}" -DDEPLOYMENT_TARGET=16.0 -DCMAKE_XCODE_CODE_SIGNING_ALLOWED=NO -DCMAKE_XCODE_CODE_SIGNING_ENABLED=NO ..
+            cmake -G "Xcode" -DCMAKE_SYSTEM_NAME="${{ matrix.tplatform }}" -DCMAKE_XCODE_CODE_SIGNING_ALLOWED=NO -DCMAKE_XCODE_CODE_SIGNING_ENABLED=NO ..
       - name: Build
         run: |
             cd build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,11 +85,10 @@ if(CMAKE_CROSSCOMPILING OR (VS_CROSSCOMP AND WIN32))
 		set(CC_GENERATOR "")
 		set(HT_ENABLE_WGSL "-DRGL_ENABLE_WEBGPU=ON")	# otherwise the separate compiler exe will not know that WGSL output should be enabled
 	endif()
-
 	add_custom_command(
 		PRE_BUILD
 		WORKING_DIRECTORY ${TOOLS_DIR}
-		COMMAND ${CMAKE_COMMAND} ${CC_GENERATOR} -DCMAKE_BUILD_TYPE=Release ${HT_ENABLE_WGSL} ${CMAKE_CURRENT_SOURCE_DIR}
+		COMMAND ${CMAKE_COMMAND} ${CC_GENERATOR} -DCMAKE_BUILD_TYPE=Release ${HT_ENABLE_WGSL} "${CMAKE_CURRENT_SOURCE_DIR}/deps/RGL"
 		OUTPUT "${TOOLS_DIR}/CMakeCache.txt"
 	)
 	if(MSVC)

diff --git a/config/init-ios.sh b/config/init-ios.sh
@@ -2,4 +2,4 @@ mkdir ../build
 cd ../build
 mkdir ios
 cd ios
-cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE="../../config/ios.toolchain.cmake" -DENABLE_ARC=OFF -DPLATFORM="OS64COMBINED" -DDEPLOYMENT_TARGET=14.0 ../..
+cmake -G "Xcode" -DCMAKE_SYSTEM_NAME="iOS" ../..
diff --git a/config/init-tvos.sh b/config/init-tvos.sh
@@ -2,4 +2,4 @@ mkdir ../build
 cd ../build
 mkdir tvos
 cd tvos
-cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE="../../config/ios.toolchain.cmake" -DPLATFORM="TVOSCOMBINED" -DDEPLOYMENT_TARGET=14.0 ../..
+cmake -G "Xcode" -DCMAKE_SYSTEM_NAME="tvOS" ../..
diff --git a/deps/RGL b/deps/RGL
+1 −1		deps/ShaderTranspiler
+2 −0		src/MTLSwapchain.hpp
+7 −0		src/MTLSwapchain.mm
+88 −0		src/WGCommandBuffer.cpp
+68 −0		src/WGCommandBuffer.hpp
+2 −1		src/WGCommandQueue.cpp
+2 −1		src/WGCommandQueue.hpp
+57 −2		src/WGPipeline.cpp
+46 −3		src/WGRenderPass.cpp
+16 −0		src/WGRenderPass.hpp
+3 −1		src/WGShaderLibrary.cpp
+17 −5		src/WGSwapchain.cpp
+5 −0		src/WGSwapchain.hpp