diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index f8e8f2ce6..dcb23c50a 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -195,9 +195,9 @@ openxr_loaderd.lib; OSDependentd.lib; pvrtc.lib; - spirv-cross-core.lib; - spirv-cross-glsl.lib; - spirv-cross-hlsl.lib; + spirv-cross-cored.lib; + spirv-cross-glsld.lib; + spirv-cross-hlsld.lib; SPIRVd.lib; squish.lib; UrlLib.lib; diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index fb6a1c88e..89e294cf8 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -63,18 +63,18 @@ namespace Babylon void UpdateView(void* windowPtr, size_t width, size_t height) { - GraphicsConfiguration graphicsConfig{}; - graphicsConfig.WindowPtr = reinterpret_cast(windowPtr); - graphicsConfig.Width = width; - graphicsConfig.Height = height; + WindowConfiguration windowConfig{}; + windowConfig.WindowPtr = reinterpret_cast(windowPtr); + windowConfig.Width = width; + windowConfig.Height = height; if (!g_graphics) { - g_graphics = Graphics::CreateGraphics(graphicsConfig); + g_graphics = Graphics::CreateGraphics(windowConfig); } else { - g_graphics->UpdateWindow(graphicsConfig); + g_graphics->UpdateWindow(windowConfig); g_graphics->UpdateSize(width, height); } diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 2a7e5394e..12160f08a 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 2a7e5394ea6b76dbde80fa6a7aa572b488484e97 +Subproject commit 12160f08a6c6025b0d6a458648321b731844976b diff --git a/Package/gulpfile.js b/Package/gulpfile.js index fc604a4a5..a41433e16 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -29,7 +29,7 @@ const clean = async () => { const makeXCodeProj = async () => { shelljs.mkdir('-p', 'iOS/Build'); - exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF ..', 'iOS/Build'); + exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF -DENABLE_PCH=OFF ..', 'iOS/Build'); }; const buildIphoneOS = async () => { diff --git a/README.md b/README.md index 88ed85eba..410cac9dc 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ iOS can only be built on a Mac. Additionally, `CMake` must manually be run to ge ``` pushd Apps/Playground/node_modules/@babylonjs/react-native/ios -cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF . +cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF -DENABLE_PCH=OFF . popd cd Apps/Playground