Build fixes for BN update

BabylonJS · Oct 2, 2023 · 2d8fda0 · 2d8fda0
1 parent b292711
commit 2d8fda0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
@@ -22,6 +22,8 @@ set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "")
 set(BABYLON_NATIVE_USE_SWAPCHAINPANEL ON CACHE BOOL "")
 set(BABYLON_NATIVE_DIR "${BABYLON_REACT_NATIVE_IOSANDROID}/submodules/BabylonNative")
 add_subdirectory(${BABYLON_NATIVE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/BabylonNative EXCLUDE_FROM_ALL)
+# Disable Unity build for UrlLib because of conflict in header between windows.h and winrt
+set_property(TARGET UrlLib PROPERTY UNITY_BUILD false)
 
 add_library(BabylonNative
     ${SHARED_SOURCES})

diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1
@@ -47,7 +47,7 @@ function Restore-CMakeProject {
     }
 
     cd $BuildDir
-    cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -A $Arch ..\..\..\windows
+    cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -G "Visual Studio 16 2019" -A $Arch ..\..\..\windows 
 
     if ($? -Eq $False) {
       Write-Error "cmake failed. Make sure cmake is added to your PATH variable"

diff --git a/Package/gulpfile.js b/Package/gulpfile.js
@@ -131,7 +131,7 @@ const initializeSubmodulesMostRecentBabylonNative = async () => {
 
 const makeUWPProjectPlatform = async (name, arch) => {
   shelljs.mkdir('-p', `./../Modules/@babylonjs/react-native/Build/uwp_${name}`);
-  exec(`cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true ${cmakeBasekitBuildDefinition} -A ${arch} ./../../../react-native-windows/windows`, `./../Modules/@babylonjs/react-native/Build/uwp_${name}`);
+  exec(`cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true ${cmakeBasekitBuildDefinition} -A ${arch} ./../../../react-native-windows/windows`, `./../Modules/@babylonjs/react-native/Build/uwp_${name}`);
 };
 
 const makeUWPProjectx86 = async () => makeUWPProjectPlatform('x86', 'Win32');