[wip] xcframework build script

BabylonJS · Sep 19, 2024 · c8b1673 · c8b1673
1 parent 1fd29d5
commit c8b1673
Show file tree

Hide file tree

Showing 7 changed files with 3,038 additions and 10,395 deletions.
diff --git a/Apps/BRNPlayground/ios/Podfile b/Apps/BRNPlayground/ios/Podfile
@@ -7,10 +7,6 @@ options = {
   :bridgeless_enabled => false,
   :fabric_enabled => false,
   :hermes_enabled => true,
-  # Fixes linking issue when using CMake > 3.24 
-  :build_setting_overrides => { 
-    'LIBRARY_SEARCH_PATHS' => '$(inherited) "$(PODS_ROOT)/../../../../Modules/@babylonjs/Build/iOS/build/"/**',
-  }
 }
 
 # react-native-permissions

diff --git a/Apps/BRNPlayground/ios/Podfile.lock b/Apps/BRNPlayground/ios/Podfile.lock
@@ -1802,7 +1802,7 @@ SPEC CHECKSUMS:
   React-logger: 4072f39df335ca443932e0ccece41fbeb5ca8404
   React-Mapbuffer: 714f2fae68edcabfc332b754e9fbaa8cfc68fdd4
   React-microtasksnativemodule: 4943ad8f99be8ccf5a63329fa7d269816609df9e
-  react-native-babylon: d42edb0fcbf1aa406fda5947db408f6459f9b49a
+  react-native-babylon: 985179b09062f9d8d0cd1fe24188138854e94085
   react-native-slider: 97ce0bd921f40de79cead9754546d5e4e7ba44f8
   React-nativeconfig: 4a9543185905fe41014c06776bf126083795aed9
   React-NativeModulesApple: 0506da59fc40d2e1e6e12a233db5e81c46face27
@@ -1835,8 +1835,8 @@ SPEC CHECKSUMS:
   ReactTestApp-Resources: 7db90c026cccdf40cfa495705ad436ccc4d64154
   RNPermissions: 5a2dafe37c8e0a3fa1d6e0783a1490b1b7fd92d6
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
-  Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47
+  Yoga: 4ef80d96a5534f0e01b3055f17d1e19a9fc61b63
 
-PODFILE CHECKSUM: 1f9ff09dc4914f4ff0a83d4d955065ca4d613829
+PODFILE CHECKSUM: c0272fe43d76243a8a0abcc5781bde0430d39023
 
 COCOAPODS: 1.15.2
diff --git a/Apps/BRNPlayground/package-lock.json b/Apps/BRNPlayground/package-lock.json
diff --git a/Modules/@babylonjs/react-native-iosandroid/.gitignore b/Modules/@babylonjs/react-native-iosandroid/.gitignore
@@ -27,6 +27,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+ios/BabylonNative.xcframework
 
 # Android/IntelliJ
 #

diff --git a/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec b/Modules/@babylonjs/react-native-iosandroid/react-native-babylon.podspec
@@ -2,6 +2,8 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
+# This Podspec is used for local development
+
 Pod::Spec.new do |s|
   s.name         = "react-native-babylon"
   s.version      = package["version"]
@@ -17,44 +19,48 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.xcconfig     = { 'USER_HEADER_SEARCH_PATHS' => '$(inherited) ${PODS_TARGET_SRCROOT}/shared ${PODS_TARGET_SRCROOT}/../react-native/shared' }
 
-  s.libraries = 'astc-encoder',
-                'etc1',
-                'etc2',
-                'nvtt',
-                'squish',
-                'pvrtc',
-                'iqa',
-                'edtaa3',
-                'tinyexr',
-                'BabylonNative',
-                'bgfx',
-                'bimg',
-                'bx',
-                'Canvas',
-                'GenericCodeGen',
-                'glslang',
-                'glslang-default-resource-limits',
-                'Graphics',
-                'jsRuntime',
-                'OGLCompiler',
-                'OSDependent',
-                'MachineIndependent',
-                'napi',
-                'NativeCamera',
-                'NativeCapture',
-                'NativeEngine',
-                'NativeInput',
-                'NativeOptimizations',
-                'NativeTracing',
-                'NativeXR',
-                'SPIRV',
-                'spirv-cross-core',
-                'spirv-cross-msl',
-                'tinyexr',
-                'UrlLib',
-                'Window',
-                'XMLHttpRequest',
-                'xr'
+  if ENV['BUILD_BABYLON_FROM_SOURCE'] == 'true' then
+    s.libraries = 'astc-encoder',
+      'etc1',
+      'etc2',
+      'nvtt',
+      'squish',
+      'pvrtc',
+      'iqa',
+      'edtaa3',
+      'tinyexr',
+      'BabylonNative',
+      'bgfx',
+      'bimg',
+      'bx',
+      'Canvas',
+      'GenericCodeGen',
+      'glslang',
+      'glslang-default-resource-limits',
+      'Graphics',
+      'jsRuntime',
+      'OGLCompiler',
+      'OSDependent',
+      'MachineIndependent',
+      'napi',
+      'NativeCamera',
+      'NativeCapture',
+      'NativeEngine',
+      'NativeInput',
+      'NativeOptimizations',
+      'NativeTracing',
+      'NativeXR',
+      'SPIRV',
+      'spirv-cross-core',
+      'spirv-cross-msl',
+      'tinyexr',
+      'UrlLib',
+      'Window',
+      'XMLHttpRequest',
+      'xr'
+  else
+    s.vendored_frameworks = "ios/BabylonNative.xcframework"
+  end
 
   s.frameworks = "MetalKit", "ARKit"