Skip to content

Commit f28ec5e

Browse files
more path fix
1 parent c683bd1 commit f28ec5e

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -294,26 +294,27 @@
294294
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" />
295295
</ImportGroup>
296296
<Target Name="BabylonNativeBuild" BeforeTargets="PrepareForBuild">
297+
<Exec Command='cmake --version' />
297298
<Exec Command='cmake ^
298-
-G "Visual Studio 16 2019" ^
299-
-B $(ProjectDir)..\..\Build_uwp$(Platform) ^
300-
-D CMAKE_SYSTEM_NAME=WindowsStore ^
301-
-D CMAKE_SYSTEM_VERSION=$(TargetPlatformVersion) ^
302-
-A $(Platform) ^
303-
-D FETCHCONTENT_FULLY_DISCONNECTED=ON ^
304-
-D BABYLON_NATIVE_BUILD_APPS=OFF ^
305-
-D BABYLON_NATIVE_INSTALL=OFF ^
306-
-D FETCHCONTENT_SOURCE_DIR_BGFX.CMAKE=../../shared/BabylonNative/deps/bgfx.cmake-src ^
307-
-D FETCHCONTENT_SOURCE_DIR_ARCANA.CPP=../../shared/BabylonNative/deps/arcana.cpp-src ^
308-
-D FETCHCONTENT_SOURCE_DIR_CMAKEEXTENSIONS=../../shared/BabylonNative/deps/cmakeextensions-src ^
309-
-D FETCHCONTENT_SOURCE_DIR_JSRUNTIMEHOST=../../shared/BabylonNative/deps/jsruntimehost-src ^
310-
-D FETCHCONTENT_SOURCE_DIR_URLLIB=../../shared/BabylonNative/deps/urllib-src ^
311-
-D FETCHCONTENT_SOURCE_DIR_SPIRV-CROSS=../../shared/BabylonNative/deps/spirv-cross-src ^
312-
-D FETCHCONTENT_SOURCE_DIR_LIBWEBP=../../shared/BabylonNative/deps/libwebp-src ^
313-
-D FETCHCONTENT_SOURCE_DIR_GLSLANG=../../shared/BabylonNative/deps/glslang-src ^
314-
-D FETCHCONTENT_SOURCE_DIR_BASE-N=../../shared/BabylonNative/deps/base-n-src ^
315-
-D FETCHCONTENT_SOURCE_DIR_IOS-CMAKE=../../shared/BabylonNative/deps/ios-cmake-src ^
316-
-S "$(ProjectDir).."' />
299+
-G"Visual Studio 16 2019" ^
300+
-B$(ProjectDir)..\..\Build_uwp$(Platform) ^
301+
-DCMAKE_SYSTEM_NAME=WindowsStore ^
302+
-DCMAKE_SYSTEM_VERSION=$(TargetPlatformVersion) ^
303+
-A$(Platform) ^
304+
-DFETCHCONTENT_FULLY_DISCONNECTED=ON ^
305+
-DBABYLON_NATIVE_BUILD_APPS=OFF ^
306+
-DBABYLON_NATIVE_INSTALL=OFF ^
307+
-DFETCHCONTENT_SOURCE_DIR_BGFX.CMAKE=$(ProjectDir)..\..\shared\BabylonNative\deps\bgfx.cmake-src ^
308+
-DFETCHCONTENT_SOURCE_DIR_ARCANA.CPP=$(ProjectDir)..\..\shared\BabylonNative\deps\arcana.cpp-src ^
309+
-DFETCHCONTENT_SOURCE_DIR_CMAKEEXTENSIONS=$(ProjectDir)..\..\shared\BabylonNative\deps\cmakeextensions-src ^
310+
-DFETCHCONTENT_SOURCE_DIR_JSRUNTIMEHOST=$(ProjectDir)..\..\shared\BabylonNative\deps\jsruntimehost-src ^
311+
-DFETCHCONTENT_SOURCE_DIR_URLLIB=$(ProjectDir)..\..\shared\BabylonNative\deps\urllib-src ^
312+
-DFETCHCONTENT_SOURCE_DIR_SPIRV-CROSS=$(ProjectDir)..\..\shared\BabylonNative\deps\spirv-cross-src ^
313+
-DFETCHCONTENT_SOURCE_DIR_LIBWEBP=$(ProjectDir)..\..\shared\BabylonNative\deps\libwebp-src ^
314+
-DFETCHCONTENT_SOURCE_DIR_GLSLANG=$(ProjectDir)..\..\shared\BabylonNative\deps\glslang-src ^
315+
-DFETCHCONTENT_SOURCE_DIR_BASE-N=$(ProjectDir)..\..\shared\BabylonNative\deps\base-n-src ^
316+
-DFETCHCONTENT_SOURCE_DIR_IOS-CMAKE=$(ProjectDir)..\..\shared\BabylonNative\deps\ios-cmake-src ^
317+
-S"$(ProjectDir).."' />
317318
<Exec Command='"MSBuild.exe" ^
318319
"$(ProjectDir)..\..\Build_uwp$(Platform)\ReactNativeBabylon.sln" ^
319320
/p:Configuration=$(Configuration) ^

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../shared ${CMAKE_CURRENT_BINARY_DIR}
1818
# Installing react-native dependencies for both the Playground app and the @babylonjs\react-native package will generate a bad bundle/runtime errors.
1919
set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "")
2020

21-
set(PLAYGROUND_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../..")
21+
set(PLAYGROUND_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../Apps/Playground")
2222

2323
if(EXISTS "${PLAYGROUND_DIR}/node_modules/react-native/package.json")
2424
get_filename_component(REACTNATIVE_DIR_CMAKE "${PLAYGROUND_DIR}/node_modules/react-native" ABSOLUTE)

0 commit comments

Comments
 (0)