Skip to content

Commit 0e40058

Browse files
Update BabylonNative submodule (#206)
* update BabylonNative submodule * PCH off for glslang * pch off * removed empty line * spirv debug libraries name suffix Co-authored-by: Cedric Guillemet <[email protected]>
1 parent 269946d commit 0e40058

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@
195195
openxr_loaderd.lib;
196196
OSDependentd.lib;
197197
pvrtc.lib;
198-
spirv-cross-core.lib;
199-
spirv-cross-glsl.lib;
200-
spirv-cross-hlsl.lib;
198+
spirv-cross-cored.lib;
199+
spirv-cross-glsld.lib;
200+
spirv-cross-hlsld.lib;
201201
SPIRVd.lib;
202202
squish.lib;
203203
UrlLib.lib;

Modules/@babylonjs/react-native/shared/BabylonNative.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ namespace Babylon
6363

6464
void UpdateView(void* windowPtr, size_t width, size_t height)
6565
{
66-
GraphicsConfiguration graphicsConfig{};
67-
graphicsConfig.WindowPtr = reinterpret_cast<WindowType>(windowPtr);
68-
graphicsConfig.Width = width;
69-
graphicsConfig.Height = height;
66+
WindowConfiguration windowConfig{};
67+
windowConfig.WindowPtr = reinterpret_cast<WindowType>(windowPtr);
68+
windowConfig.Width = width;
69+
windowConfig.Height = height;
7070

7171
if (!g_graphics)
7272
{
73-
g_graphics = Graphics::CreateGraphics(graphicsConfig);
73+
g_graphics = Graphics::CreateGraphics(windowConfig);
7474
}
7575
else
7676
{
77-
g_graphics->UpdateWindow(graphicsConfig);
77+
g_graphics->UpdateWindow(windowConfig);
7878
g_graphics->UpdateSize(width, height);
7979
}
8080

Submodule BabylonNative updated 114 files

Package/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const clean = async () => {
2929

3030
const makeXCodeProj = async () => {
3131
shelljs.mkdir('-p', 'iOS/Build');
32-
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');
32+
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');
3333
};
3434

3535
const buildIphoneOS = async () => {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ iOS can only be built on a Mac. Additionally, `CMake` must manually be run to ge
132132

133133
```
134134
pushd Apps/Playground/node_modules/@babylonjs/react-native/ios
135-
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 .
135+
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 .
136136
popd
137137
138138
cd Apps/Playground

0 commit comments

Comments
 (0)