diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de4a126..c39230d 100644
--- 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
index 1ed7c6d..c42f58d 100644
--- 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
index c95bd69..3a976f0 100755
--- 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
index 3d3a60e..69a4bf9 100755
--- 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
index 3316003..32259ea 160000
--- a/deps/RGL
+++ b/deps/RGL
@@ -1 +1 @@
-Subproject commit 3316003e3a8746b4abe65a99b516395eb82cae47
+Subproject commit 32259ea931460b213787346855458cb3e1e71e19