Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions package/example/AppExampleFabric/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament (1.5.1):
- react-native-filament (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1255,16 +1255,16 @@ PODS:
- React-featureflags
- React-graphics
- React-ImageManager
- react-native-filament/camutils (= 1.5.1)
- react-native-filament/filamat (= 1.5.1)
- react-native-filament/filament (= 1.5.1)
- react-native-filament/gltfio_core (= 1.5.1)
- react-native-filament/image (= 1.5.1)
- react-native-filament/ktxreader (= 1.5.1)
- react-native-filament/math (= 1.5.1)
- react-native-filament/tsl (= 1.5.1)
- react-native-filament/uberz (= 1.5.1)
- react-native-filament/utils (= 1.5.1)
- react-native-filament/camutils (= 1.6.1)
- react-native-filament/filamat (= 1.6.1)
- react-native-filament/filament (= 1.6.1)
- react-native-filament/gltfio_core (= 1.6.1)
- react-native-filament/image (= 1.6.1)
- react-native-filament/ktxreader (= 1.6.1)
- react-native-filament/math (= 1.6.1)
- react-native-filament/tsl (= 1.6.1)
- react-native-filament/uberz (= 1.6.1)
- react-native-filament/utils (= 1.6.1)
- react-native-worklets-core
- React-NativeModulesApple
- React-RCTFabric
Expand All @@ -1274,7 +1274,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/camutils (1.5.1):
- react-native-filament/camutils (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1297,7 +1297,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/filamat (1.5.1):
- react-native-filament/filamat (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1321,7 +1321,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/filament (1.5.1):
- react-native-filament/filament (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1345,7 +1345,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/gltfio_core (1.5.1):
- react-native-filament/gltfio_core (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1370,7 +1370,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/image (1.5.1):
- react-native-filament/image (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1393,7 +1393,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/ktxreader (1.5.1):
- react-native-filament/ktxreader (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1417,7 +1417,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/math (1.5.1):
- react-native-filament/math (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1439,7 +1439,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/tsl (1.5.1):
- react-native-filament/tsl (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1461,7 +1461,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/uberz (1.5.1):
- react-native-filament/uberz (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1486,7 +1486,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-filament/utils (1.5.1):
- react-native-filament/utils (1.6.1):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2346,7 +2346,7 @@ SPEC CHECKSUMS:
React-logger: 697873f06b8ba436e3cddf28018ab4741e8071b6
React-Mapbuffer: c174e11bdea12dce07df8669d6c0dc97eb0c7706
React-microtasksnativemodule: 8a80099ad7391f4e13a48b12796d96680f120dc6
react-native-filament: a46c90d95245569cad6668416510e58c9d74c808
react-native-filament: eea839d2c6841dc223fac92fea8306eb7808e9f7
react-native-safe-area-context: d6406c2adbd41b2e09ab1c386781dc1c81a90919
react-native-video: 10dc1099e2b0a4d7988c9d2f4424ff68b3922208
react-native-worklets-core: 7186c6632dc36ebec96b2e205388ea0ac224dd91
Expand Down
16 changes: 15 additions & 1 deletion package/react-native-filament.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Pod::Spec.new do |s|
s.pod_target_xcconfig = {
"GCC_PREPROCESSOR_DEFINITIONS" => "FILAMENT_APP_USE_METAL=1 HAS_WORKLETS=#{hasWorklets} RNF_ENABLE_LOGS=#{enableLogs} $(inherited)",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp/**\" \"$(PODS_TARGET_SRCROOT)/ios/libs/bullet3/**\""
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp/**\" \"$(PODS_TARGET_SRCROOT)/ios/libs/bullet3/**\" \"$(PODS_TARGET_SRCROOT)/ios/libs/filament/include/**\""
}

# Configure sub podspecs for filament
Expand Down Expand Up @@ -56,12 +56,15 @@ Pod::Spec.new do |s|
ss.source_files = "ios/libs/filament/include/camutils/*.h"
ss.vendored_frameworks = "ios/libs/filament/lib/libcamutils.xcframework"
ss.header_dir = "camutils"
ss.header_mappings_dir = "ios/libs/filament/include"
ss.dependency "react-native-filament/math"
end

s.subspec "utils" do |ss|
ss.source_files = "ios/libs/filament/include/utils/**/*.h"
ss.header_mappings_dir = "ios/libs/filament/include"
ss.header_dir = "utils"
ss.header_mappings_dir = "ios/libs/filament/include"
ss.vendored_frameworks = "ios/libs/filament/lib/libutils.xcframework"
ss.dependency "react-native-filament/tsl"
end
Expand All @@ -74,6 +77,7 @@ Pod::Spec.new do |s|
s.subspec "math" do |ss|
ss.source_files = "ios/libs/filament/include/math/*.h"
ss.header_dir = "math"
ss.header_mappings_dir = "ios/libs/filament/include"
end

s.subspec "filamat" do |ss|
Expand Down Expand Up @@ -140,6 +144,14 @@ Pod::Spec.new do |s|
"ios/src/**/*.{h,m,mm,cpp}",
"ios/libs/bullet3/**/*.{h,c,cpp}"
]

# Exclude bullet3 -all files to avoid duplicate symbols in building w/ dynamic frameworks
s.exclude_files = [
"ios/libs/bullet3/**/bt*All.{h,cpp}",
"ios/libs/bullet3/**/btLinearMathAll.cpp",
"ios/libs/bullet3/**/btBulletCollisionAll.cpp",
"ios/libs/bullet3/**/btBulletDynamicsAll.cpp"
]

# Any private headers that are not globally unique should be mentioned here.
# Otherwise there will be a nameclash, since CocoaPods flattens out any header directories
Expand All @@ -150,6 +162,8 @@ Pod::Spec.new do |s|
]

s.dependency "react-native-worklets-core"

s.ios.frameworks = 'AVFoundation', 'CoreMedia'

if defined?($RNFExcludeAssets) && $RNFExcludeAssets == true
Pod::UI.puts "[react-native-filament] Excluding assets!"
Expand Down