Skip to content

Commit b3716d9

Browse files
bghgarybghgary
authored
Update to the latest Babylon Native and various build fixes (#324)
1 parent 0b050d0 commit b3716d9

File tree

17 files changed

+183
-215
lines changed

17 files changed

+183
-215
lines changed

‎Apps/Playground/scripts/tools.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const chalk = require('chalk');
44

55
function iosCmake() {
66
console.log(chalk.black.bgCyan('Running CMake for iOS...'));
7-
shelljs.exec('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 .', {cwd: 'node_modules/@babylonjs/react-native/ios'});
7+
shelljs.exec('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_PCH=OFF .', {cwd: 'node_modules/@babylonjs/react-native/ios'});
88
}
99

1010
function postInstall() {

‎Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonModule.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void BabylonModule::CustomInitialize(const winrt::Microsoft::ReactNative::ReactP
2424
});
2525
}
2626
};
27-
Babylon::Initialize(jsiRuntime, jsDispatcher);
27+
BabylonNative::Initialize(jsiRuntime, jsDispatcher);
2828
result.Resolve(true);
2929
}
3030
});
@@ -34,7 +34,7 @@ REACT_METHOD(ResetView, L"resetView");
3434
void BabylonModule::ResetView(const winrt::Microsoft::ReactNative::ReactPromise<bool>& result) noexcept
3535
{
3636
_reactContext.UIDispatcher().Post([result]() {
37-
Babylon::ResetView();
37+
BabylonNative::ResetView();
3838
result.Resolve(true);
3939
});
4040
}

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

+33-33
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == '' And Exists('$(ProjectDir)..\..\..\..\..\Apps\Playground\node_modules\react-native-windows\package.json')">$(ProjectDir)\..\..\..\..\..\Apps\Playground\node_modules\react-native-windows\</ReactNativeWindowsDir>
2929
</PropertyGroup>
3030
<PropertyGroup Label="BabylonReactNativeProps">
31-
<BabylonReactNativeDir Condition="'$(BabylonReactNativeDir)' == '' And Exists('$(ProjectDir)\..\..\..\react-native')">$(ProjectDir)\..\..\..\react-native</BabylonReactNativeDir>
32-
<BabylonNativeDir Condition="Exists('$(BabylonReactNativeDir)\submodules\BabylonNative')">$(BabylonReactNativeDir)\Build</BabylonNativeDir>
33-
<BabylonNativeBuildDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_x64\</BabylonNativeBuildDir>
34-
<BabylonNativeBuildDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_x86\</BabylonNativeBuildDir>
35-
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_arm\</BabylonNativeBuildDir>
36-
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_arm64\</BabylonNativeBuildDir>
31+
<BabylonReactNativeDir Condition="'$(BabylonReactNativeDir)' == '' And Exists('$(ProjectDir)\..\..\..\react-native')">$(ProjectDir)..\..\..\react-native\</BabylonReactNativeDir>
32+
<BabylonNativeDir Condition="Exists('$(BabylonReactNativeDir)submodules\BabylonNative')">$(BabylonReactNativeDir)Build\</BabylonNativeDir>
33+
<BabylonNativeBuildDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)uwp_x64\</BabylonNativeBuildDir>
34+
<BabylonNativeBuildDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)uwp_x86\</BabylonNativeBuildDir>
35+
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)uwp_arm\</BabylonNativeBuildDir>
36+
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)uwp_arm64\</BabylonNativeBuildDir>
3737
<BabylonNativeLibsDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' == ''">..\libs\x64\</BabylonNativeLibsDir>
3838
<BabylonNativeLibsDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' == ''">..\libs\x86\</BabylonNativeLibsDir>
3939
<BabylonNativeLibsDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' == ''">..\libs\arm\</BabylonNativeLibsDir>
@@ -126,35 +126,35 @@
126126
<!-- Library directories when building in repo -->
127127
<!-- Note: you can add BabylonNative component build folders here as needed -->
128128
<AdditionalLibraryDirectories Condition="'$(BabylonNativeBuildDir)' != ''">
129-
$(BabylonNativeBuildDir)\Core\JsRuntime\$(Configuration);
130-
$(BabylonNativeBuildDir)\Core\Graphics\$(Configuration);
131-
$(BabylonNativeBuildDir)\Dependencies\arcana.cpp\$(Configuration);
132-
$(BabylonNativeBuildDir)\Dependencies\bgfx.cmake\$(Configuration);
133-
$(BabylonNativeBuildDir)\Dependencies\glslang\glslang\$(Configuration);
134-
$(BabylonNativeBuildDir)\Dependencies\glslang\glslang\OSDependent\Windows\$(Configuration);
135-
$(BabylonNativeBuildDir)\Dependencies\glslang\OGLCompilersDLL\$(Configuration);
136-
$(BabylonNativeBuildDir)\Dependencies\glslang\SPIRV\$(Configuration);
137-
$(BabylonNativeBuildDir)\Dependencies\napi\napi-jsi\$(Configuration);
138-
$(BabylonNativeBuildDir)\Dependencies\SPIRV-Cross\$(Configuration);
139-
$(BabylonNativeBuildDir)\Dependencies\UrlLib\$(Configuration);
140-
$(BabylonNativeBuildDir)\Dependencies\xr\$(Configuration);
141-
$(BabylonNativeBuildDir)\Dependencies\xr\Dependencies\OpenXR-SDK\src\loader\$(Configuration);
142-
$(BabylonNativeBuildDir)\jsi\$(Configuration);
143-
$(BabylonNativeBuildDir)\Plugins\NativeCapture\$(Configuration);
144-
$(BabylonNativeBuildDir)\Plugins\NativeEngine\$(Configuration);
145-
$(BabylonNativeBuildDir)\Plugins\NativeInput\$(Configuration);
146-
$(BabylonNativeBuildDir)\Plugins\NativeOptimizations\$(Configuration);
147-
$(BabylonNativeBuildDir)\Plugins\NativeTracing\$(Configuration);
148-
$(BabylonNativeBuildDir)\Plugins\NativeXr\$(Configuration);
149-
$(BabylonNativeBuildDir)\Polyfills\Window\$(Configuration);
150-
$(BabylonNativeBuildDir)\Polyfills\XMLHttpRequest\$(Configuration);
151-
$(BabylonNativeBuildDir)\Polyfills\Canvas\$(Configuration);
152-
$(BabylonNativeBuildDir)\$(Configuration);
129+
$(BabylonNativeBuildDir)BabylonNative\Core\JsRuntime\$(Configuration);
130+
$(BabylonNativeBuildDir)BabylonNative\Core\Graphics\$(Configuration);
131+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\arcana.cpp\$(Configuration);
132+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\bgfx.cmake\$(Configuration);
133+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\glslang\glslang\$(Configuration);
134+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\glslang\glslang\OSDependent\Windows\$(Configuration);
135+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\glslang\OGLCompilersDLL\$(Configuration);
136+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\glslang\SPIRV\$(Configuration);
137+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\napi\napi-jsi\$(Configuration);
138+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\SPIRV-Cross\$(Configuration);
139+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\UrlLib\$(Configuration);
140+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\$(Configuration);
141+
$(BabylonNativeBuildDir)BabylonNative\Dependencies\xr\Dependencies\OpenXR-SDK\src\loader\$(Configuration);
142+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeCapture\$(Configuration);
143+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeEngine\$(Configuration);
144+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeInput\$(Configuration);
145+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeOptimizations\$(Configuration);
146+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeTracing\$(Configuration);
147+
$(BabylonNativeBuildDir)BabylonNative\Plugins\NativeXr\$(Configuration);
148+
$(BabylonNativeBuildDir)BabylonNative\Polyfills\Window\$(Configuration);
149+
$(BabylonNativeBuildDir)BabylonNative\Polyfills\XMLHttpRequest\$(Configuration);
150+
$(BabylonNativeBuildDir)BabylonNative\Polyfills\Canvas\$(Configuration);
151+
$(BabylonNativeBuildDir)jsi\$(Configuration);
152+
$(BabylonNativeBuildDir)$(Configuration);
153153
%(AdditionalLibraryDirectories);
154154
</AdditionalLibraryDirectories>
155155
<!-- Library directories when building from npm package -->
156156
<AdditionalLibraryDirectories Condition="'$(BabylonNativeLibsDir)' != ''">
157-
$(BabylonNativeLibsDir)\$(Configuration);
157+
$(BabylonNativeLibsDir)$(Configuration);
158158
%(AdditionalLibraryDirectories)
159159
</AdditionalLibraryDirectories>
160160
</Link>
@@ -163,7 +163,7 @@
163163
<ClCompile>
164164
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165165
<!-- Include project headers when building in the repo -->
166-
<AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)\shared')">$(BabylonReactNativeDir)\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
166+
<AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)shared')">$(BabylonReactNativeDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167167
</ClCompile>
168168
<Link>
169169
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -221,7 +221,7 @@
221221
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
222222
<ClCompile>
223223
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224-
<AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)\shared')">$(BabylonReactNativeDir)\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
224+
<AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)shared')">$(BabylonReactNativeDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225225
</ClCompile>
226226
<Link>
227227
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/EngineView.cpp

+21-22
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ namespace winrt::BabylonReactNative::implementation {
5353
_width = static_cast<size_t>(size.Width);
5454
_height = static_cast<size_t>(size.Height);
5555

56-
auto windowPtr = get_abi(static_cast<winrt::Windows::UI::Xaml::Controls::SwapChainPanel>(*this));
57-
Babylon::UpdateView(windowPtr, _width, _height);
56+
BabylonNative::UpdateView(static_cast<winrt::Windows::UI::Xaml::Controls::SwapChainPanel>(*this), _width, _height);
5857
}
5958

6059
void EngineView::OnPointerPressed(IInspectable const& /*sender*/, PointerEventArgs const& args)
@@ -78,25 +77,25 @@ namespace winrt::BabylonReactNative::implementation {
7877
{
7978
if (properties.IsLeftButtonPressed())
8079
{
81-
_pressedMouseButtons.insert(Babylon::LEFT_MOUSE_BUTTON_ID);
82-
Babylon::SetMouseButtonState(Babylon::LEFT_MOUSE_BUTTON_ID, true, x, y);
80+
_pressedMouseButtons.insert(BabylonNative::LEFT_MOUSE_BUTTON_ID);
81+
BabylonNative::SetMouseButtonState(BabylonNative::LEFT_MOUSE_BUTTON_ID, true, x, y);
8382
}
8483

8584
if (properties.IsMiddleButtonPressed())
8685
{
87-
_pressedMouseButtons.insert(Babylon::MIDDLE_MOUSE_BUTTON_ID);
88-
Babylon::SetMouseButtonState(Babylon::MIDDLE_MOUSE_BUTTON_ID, true, x, y);
86+
_pressedMouseButtons.insert(BabylonNative::MIDDLE_MOUSE_BUTTON_ID);
87+
BabylonNative::SetMouseButtonState(BabylonNative::MIDDLE_MOUSE_BUTTON_ID, true, x, y);
8988
}
9089

9190
if (properties.IsRightButtonPressed())
9291
{
93-
_pressedMouseButtons.insert(Babylon::RIGHT_MOUSE_BUTTON_ID);
94-
Babylon::SetMouseButtonState(Babylon::RIGHT_MOUSE_BUTTON_ID, true, x, y);
92+
_pressedMouseButtons.insert(BabylonNative::RIGHT_MOUSE_BUTTON_ID);
93+
BabylonNative::SetMouseButtonState(BabylonNative::RIGHT_MOUSE_BUTTON_ID, true, x, y);
9594
}
9695
}
9796
else
9897
{
99-
Babylon::SetTouchButtonState(pointerId, true, x, y);
98+
BabylonNative::SetTouchButtonState(pointerId, true, x, y);
10099
}
101100
}
102101

@@ -110,12 +109,12 @@ namespace winrt::BabylonReactNative::implementation {
110109

111110
if (deviceType == PointerDeviceType::Mouse)
112111
{
113-
Babylon::SetMousePosition(x, y);
112+
BabylonNative::SetMousePosition(x, y);
114113
}
115114
else
116115
{
117116
const auto pointerId = point.PointerId();
118-
Babylon::SetTouchPosition(pointerId, x, y);
117+
BabylonNative::SetTouchPosition(pointerId, x, y);
119118
}
120119
}
121120

@@ -139,34 +138,34 @@ namespace winrt::BabylonReactNative::implementation {
139138
if (point.PointerDevice().PointerDeviceType() == PointerDeviceType::Mouse)
140139
{
141140
if (!properties.IsLeftButtonPressed() &&
142-
_pressedMouseButtons.find(Babylon::LEFT_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
141+
_pressedMouseButtons.find(BabylonNative::LEFT_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
143142
{
144-
_pressedMouseButtons.erase(Babylon::LEFT_MOUSE_BUTTON_ID);
145-
Babylon::SetMouseButtonState(Babylon::LEFT_MOUSE_BUTTON_ID, false, x, y);
143+
_pressedMouseButtons.erase(BabylonNative::LEFT_MOUSE_BUTTON_ID);
144+
BabylonNative::SetMouseButtonState(BabylonNative::LEFT_MOUSE_BUTTON_ID, false, x, y);
146145
}
147146

148147
if (!properties.IsMiddleButtonPressed() &&
149-
_pressedMouseButtons.find(Babylon::MIDDLE_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
148+
_pressedMouseButtons.find(BabylonNative::MIDDLE_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
150149
{
151-
_pressedMouseButtons.erase(Babylon::MIDDLE_MOUSE_BUTTON_ID);
152-
Babylon::SetMouseButtonState(Babylon::MIDDLE_MOUSE_BUTTON_ID, false, x, y);
150+
_pressedMouseButtons.erase(BabylonNative::MIDDLE_MOUSE_BUTTON_ID);
151+
BabylonNative::SetMouseButtonState(BabylonNative::MIDDLE_MOUSE_BUTTON_ID, false, x, y);
153152
}
154153

155154
if (!properties.IsRightButtonPressed() &&
156-
_pressedMouseButtons.find(Babylon::RIGHT_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
155+
_pressedMouseButtons.find(BabylonNative::RIGHT_MOUSE_BUTTON_ID) != _pressedMouseButtons.end())
157156
{
158-
_pressedMouseButtons.erase(Babylon::RIGHT_MOUSE_BUTTON_ID);
159-
Babylon::SetMouseButtonState(Babylon::RIGHT_MOUSE_BUTTON_ID, false, x, y);
157+
_pressedMouseButtons.erase(BabylonNative::RIGHT_MOUSE_BUTTON_ID);
158+
BabylonNative::SetMouseButtonState(BabylonNative::RIGHT_MOUSE_BUTTON_ID, false, x, y);
160159
}
161160
}
162161
else
163162
{
164-
Babylon::SetTouchButtonState(pointerId, false, x, y);
163+
BabylonNative::SetTouchButtonState(pointerId, false, x, y);
165164
}
166165
}
167166

168167
void EngineView::OnRendering()
169168
{
170-
Babylon::RenderView();
169+
BabylonNative::RenderView();
171170
}
172171
}

‎Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt

+10-29
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,31 @@
1-
# cmake 3.15.3+ because of a c++ regression when swift is enable
21
cmake_minimum_required(VERSION 3.15.3)
32
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
43

54
project(ReactNativeBabylon)
65

7-
set(BABYLON_NATIVE_PLATFORM "UWP")
8-
set(CMAKE_SYSTEM_NAME "WindowsStore")
9-
set(CMAKE_SYSTEM_VERSION "10.0")
10-
116
set(CMAKE_CXX_STANDARD 17)
12-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
137

148
set(BABYLON_REACT_NATIVE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native")
15-
set(BABYLON_NATIVE_WINDOWS_STORE_USE_SWAPCHAINPANEL 1)
16-
17-
if (NOT GRAPHICS_API OR GRAPHICS_API STREQUAL "")
18-
set (GRAPHICS_API "D3D11")
19-
message("No GRAPHICS_API specified. Defaulting to D3D11.")
20-
endif()
21-
229
include(${BABYLON_REACT_NATIVE_DIR}/shared/CMakeLists.txt)
2310

24-
set(BABYLON_NATIVE_DIR "${BABYLON_REACT_NATIVE_DIR}/submodules/BabylonNative")
25-
2611
# Configure Babylon Native to use JSI
2712
# Note: We should avoid installing node_modules in the Module\@babylonjs\react-native folder.
2813
# Installing react-native dependencies for both the Playground app and the @babylonjs\react-native package will generate a bad bundle/runtime errors.
29-
set(PLAYGROUND_NODE_MODULES_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/Playground/node_modules")
30-
set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "The JavaScript engine to power N-API")
31-
set(REACTNATIVE_DIR_CMAKE "${PLAYGROUND_NODE_MODULES_DIR}/react-native")
14+
set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "")
15+
set(REACTNATIVE_DIR_CMAKE "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/Playground/node_modules/react-native")
3216
add_subdirectory("${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi/jsi" ${CMAKE_CURRENT_BINARY_DIR}/jsi)
3317
target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi)
3418

35-
add_subdirectory("${BABYLON_NATIVE_DIR}/Dependencies" ${CMAKE_CURRENT_BINARY_DIR}/Dependencies EXCLUDE_FROM_ALL)
36-
add_subdirectory("${BABYLON_NATIVE_DIR}/Core" ${CMAKE_CURRENT_BINARY_DIR}/Core EXCLUDE_FROM_ALL)
37-
add_subdirectory("${BABYLON_NATIVE_DIR}/Plugins" ${CMAKE_CURRENT_BINARY_DIR}/Plugins EXCLUDE_FROM_ALL)
38-
add_subdirectory("${BABYLON_NATIVE_DIR}/Polyfills" ${CMAKE_CURRENT_BINARY_DIR}/Polyfills EXCLUDE_FROM_ALL)
19+
set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "")
20+
set(BABYLON_NATIVE_USE_SWAPCHAINPANEL ON CACHE BOOL "")
21+
set(BABYLON_NATIVE_DIR "${BABYLON_REACT_NATIVE_DIR}/submodules/BabylonNative")
22+
add_subdirectory(${BABYLON_NATIVE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/BabylonNative EXCLUDE_FROM_ALL)
23+
24+
add_library(BabylonNative
25+
${SHARED_SOURCES})
3926

40-
add_library(BabylonNative ${SHARED_SOURCES})
4127
target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES})
28+
4229
target_link_libraries(BabylonNative
4330
arcana
4431
Graphics
@@ -53,9 +40,3 @@ target_link_libraries(BabylonNative
5340
Window
5441
XMLHttpRequest
5542
Canvas)
56-
57-
if(DEFINED EXTENSIONS_DIRS)
58-
foreach(extensionDir IN LISTS EXTENSIONS_DIRS)
59-
add_subdirectory(${extensionDir} "Extensions" EXCLUDE_FROM_ALL)
60-
endforeach()
61-
endif()

‎Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1

+1-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ function Restore-CMakeProject {
4747
}
4848

4949
cd $BuildDir
50-
if ($Arch -Eq "x64") {
51-
cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI ..\..\..\windows
52-
} else {
53-
cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A $Arch ..\..\..\windows
54-
}
50+
cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -A $Arch ..\..\..\windows
5551

5652
if ($? -Eq $False) {
5753
Write-Error "cmake failed. Make sure cmake is added to your PATH variable"

‎Modules/@babylonjs/react-native/android/CMakeLists.txt

+2-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,8 @@ cmake_minimum_required(VERSION 3.13.2)
2121
project(ReactNativeBabylon)
2222
include(${CMAKE_CURRENT_LIST_DIR}/../shared/CMakeLists.txt)
2323

24-
string(TOUPPER ${GRAPHICS_API} GRAPHICS_API_UPPER)
25-
add_definitions("-D${GRAPHICS_API_UPPER}")
26-
2724
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
28-
set(BABYLON_NATIVE_PLATFORM "Android")
29-
set(CMAKE_CXX_EXTENSIONS OFF)
30-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
25+
set(CMAKE_CXX_STANDARD 17)
3126
file(TO_CMAKE_PATH "${REACTNATIVE_DIR}" REACTNATIVE_DIR_CMAKE)
3227

3328
# Configure Babylon Native to use JSI
@@ -37,6 +32,7 @@ target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/js
3732

3833
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/")
3934

35+
set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "")
4036
set(BABYLON_NATIVE_DIR "${CMAKE_CURRENT_LIST_DIR}/../submodules/BabylonNative")
4137
add_subdirectory(${BABYLON_NATIVE_DIR} ${BABYLON_NATIVE_DIR}/build/Android_${CMAKE_ANDROID_ARCH_ABI}/)
4238

‎Modules/@babylonjs/react-native/android/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ android {
6565
cmake {
6666
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
6767
arguments '-DANDROID_STL=c++_static',
68-
'-DENABLE_GLSLANG_BINARIES=OFF',
69-
'-DSPIRV_CROSS_CLI=OFF',
7068
"-DGRAPHICS_API=${graphics_api}",
7169
"-DARCORE_LIBPATH=${extractedLibDir}/jni",
7270
"-DFBJNI_INCPATH=${extractedLibDir}/fbjni/",

0 commit comments

Comments
 (0)