up BabylonNative for Flip after render Change (#629)

* up BabylonNative for Flip after render Change * ios cmake update * glsl
BabylonJS · Dec 21, 2023 · cc872f0 · cc872f0
1 parent 32a6611
commit cc872f0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt
@@ -4,7 +4,7 @@ include(FetchContent)
 
 FetchContent_Declare(ios-cmake
     GIT_REPOSITORY https://github.com/leetal/ios-cmake.git
-    GIT_TAG 04d91f6675dabb3c97df346a32f6184b0a7ef845)
+    GIT_TAG 4.4.1)
 
 FetchContent_MakeAvailable(ios-cmake)
 set(CMAKE_TOOLCHAIN_FILE "${ios-cmake_SOURCE_DIR}/ios.toolchain.cmake" CACHE PATH "")

diff --git a/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec b/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec
@@ -49,7 +49,6 @@ Pod::Spec.new do |s|
                 'NativeXR',
                 'SPIRV',
                 'spirv-cross-core',
-                'spirv-cross-glsl',
                 'spirv-cross-msl',
                 'tinyexr',
                 'UrlLib',

diff --git a/...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
@@ -205,7 +205,6 @@
         OSDependentd.lib;
         pvrtc.lib;
         spirv-cross-cored.lib;
-        spirv-cross-glsld.lib;
         spirv-cross-hlsld.lib;
         SPIRVd.lib;
         squish.lib;
@@ -267,7 +266,6 @@
         OSDependent.lib;
         pvrtc.lib;
         spirv-cross-core.lib;
-        spirv-cross-glsl.lib;
         spirv-cross-hlsl.lib;
         SPIRV.lib;
         squish.lib;

diff --git a/Modules/@babylonjs/react-native/shared/CMakeLists.txt b/Modules/@babylonjs/react-native/shared/CMakeLists.txt
@@ -2,7 +2,7 @@ include(FetchContent)
 
 FetchContent_Declare(babylonnative
     GIT_REPOSITORY https://github.com/BabylonJS/BabylonNative.git
-    GIT_TAG 5865dc3c9e66d373230b20d7f9acf3adc8d37493)
+    GIT_TAG 2dd675f5b9a3b2592251404369a49b10cf42ea1f)
 
 set(SHARED_INCLUDES
     "${CMAKE_CURRENT_LIST_DIR}")

diff --git a/Package/BaseKit/react-native-babylon.podspec b/Package/BaseKit/react-native-babylon.podspec
@@ -44,7 +44,6 @@ Pod::Spec.new do |s|
     'ios/libs/libOSDependent.a',
     'ios/libs/libpvrtc.a',
     'ios/libs/libspirv-cross-core.a',
-    'ios/libs/libspirv-cross-glsl.a',
     'ios/libs/libspirv-cross-msl.a',
     'ios/libs/libSPIRV.a',
     'ios/libs/libsquish.a',

diff --git a/Package/gulpfile.js b/Package/gulpfile.js
@@ -517,7 +517,6 @@ const validateAssemblediOSAndroid = async () => {
     `${assemblediOSAndroidDir}/ios/libs/libOGLCompiler.a`,
     `${assemblediOSAndroidDir}/ios/libs/libOSDependent.a`,
     `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-core.a`,
-    `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-glsl.a`,
     `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-msl.a`,
     `${assemblediOSAndroidDir}/ios/libs/libSPIRV.a`,
     `${assemblediOSAndroidDir}/ios/libs/libtinyexr.a`,

diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt
@@ -4,7 +4,7 @@ include(FetchContent)
 
 FetchContent_Declare(ios-cmake
     GIT_REPOSITORY https://github.com/leetal/ios-cmake.git
-    GIT_TAG 04d91f6675dabb3c97df346a32f6184b0a7ef845)
+    GIT_TAG 4.4.1)
 
 FetchContent_MakeAvailable(ios-cmake)
 set(CMAKE_TOOLCHAIN_FILE "${ios-cmake_SOURCE_DIR}/ios.toolchain.cmake" CACHE PATH "")
@@ -54,7 +54,6 @@ set(PACKAGED_LIBS
     NativeXr
     SPIRV
     spirv-cross-core
-    spirv-cross-glsl
     spirv-cross-msl
     tinyexr
     UrlLib