From 52d9458dd04531a213ce3c1e5516beef88426888 Mon Sep 17 00:00:00 2001
From: Chris Barth <chriba@microsoft.com>
Date: Wed, 31 Mar 2021 10:30:05 -0700
Subject: [PATCH 1/3] move to most recent master

---
 Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative
index 4ea4accb8..11e741183 160000
--- a/Modules/@babylonjs/react-native/submodules/BabylonNative
+++ b/Modules/@babylonjs/react-native/submodules/BabylonNative
@@ -1 +1 @@
-Subproject commit 4ea4accb8b433b4f11e1ffa4df76c080624248f5
+Subproject commit 11e74118373bed93e1195da034af42cda49b376a

From 0811242d5a404fd91f3a0d999d7c6823d5c609dc Mon Sep 17 00:00:00 2001
From: Chris Barth <chriba@microsoft.com>
Date: Wed, 31 Mar 2021 11:57:59 -0700
Subject: [PATCH 2/3] move to most recent master and rebuild cmake solutions

---
 .../windows/BabylonReactNative/BabylonReactNative.vcxproj   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
index e11e63f3b..648cef8d4 100644
--- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
+++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
@@ -192,7 +192,7 @@
         NativeXr.lib;
         nvtt.lib;
         OGLCompilerd.lib;
-        openxr_loader.lib;
+        openxr_loaderd.lib;
         OSDependentd.lib;
         pvrtc.lib;
         spirv-cross-core.lib;
@@ -328,4 +328,8 @@
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', $(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
+  <Target Name="BuildBabylonNativeStaticLibs" BeforeTargets="PrepareForBuild">
+    <Message Text="Building BabylonNative static libs for $(Platform) $(Configuration)"/>
+    <Exec Command="$(ProjectDir)\..\scripts\Build.bat -Platform $(Platform) -Configuration $(Configuration)"/>
+  </Target>
 </Project>
\ No newline at end of file

From 29c237dad7f28a5d29f452aedd8b79cc81e8d762 Mon Sep 17 00:00:00 2001
From: Chris Barth <chriba@microsoft.com>
Date: Wed, 31 Mar 2021 12:03:27 -0700
Subject: [PATCH 3/3] add conditional step for building babylonnative static
 libs

---
 .../windows/BabylonReactNative/BabylonReactNative.vcxproj      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
index 648cef8d4..92a47987a 100644
--- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
+++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
@@ -328,7 +328,8 @@
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', $(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.210122.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-  <Target Name="BuildBabylonNativeStaticLibs" BeforeTargets="PrepareForBuild">
+  <Target Name="BuildBabylonNativeStaticLibs" BeforeTargets="PrepareForBuild"
+          Condition="'$(BabylonNativeBuildDir)' != ''">
     <Message Text="Building BabylonNative static libs for $(Platform) $(Configuration)"/>
     <Exec Command="$(ProjectDir)\..\scripts\Build.bat -Platform $(Platform) -Configuration $(Configuration)"/>
   </Target>