From f799ae5677b918e657e8f5360f52c86b25c1b048 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Tue, 4 Oct 2022 09:27:15 +0800 Subject: [PATCH] update example project iOS project files --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 6 +++ example/ios/Podfile.lock | 45 +++----------------- example/ios/Runner.xcodeproj/project.pbxproj | 18 ++++++++ 4 files changed, 32 insertions(+), 39 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f9..9625e105 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 9061ff8f..39a10d12 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -37,5 +37,11 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + target.build_settings(config.name)['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES' + end + end + installer.pods_project.build_configuration_list.build_configurations.each do |configuration| + configuration.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES' end end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index c0f0872d..993d70a4 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,53 +1,22 @@ PODS: - - Filament (1.12.4): - - Filament/camutils (= 1.12.4) - - Filament/filamat (= 1.12.4) - - Filament/filament (= 1.12.4) - - Filament/filameshio (= 1.12.4) - - Filament/gltfio_core (= 1.12.4) - - Filament/image (= 1.12.4) - - Filament/math (= 1.12.4) - - Filament/utils (= 1.12.4) - - Filament/camutils (1.12.4): - - Filament/math - - Filament/filamat (1.12.4): - - Filament/math - - Filament/utils - - Filament/filament (1.12.4): - - Filament/math - - Filament/utils - - Filament/filameshio (1.12.4): - - Filament/filament - - Filament/gltfio_core (1.12.4): - - Filament/filament - - Filament/image (1.12.4): - - Filament/filament - - Filament/math (1.12.4) - - Filament/utils (1.12.4) - Flutter (1.0.0) - - mimetic_filament (0.0.1): - - Filament (~> 1.12.4) + - polyvox_filament (0.0.1): - Flutter DEPENDENCIES: - Flutter (from `Flutter`) - - mimetic_filament (from `.symlinks/plugins/mimetic_filament/ios`) - -SPEC REPOS: - trunk: - - Filament + - polyvox_filament (from `.symlinks/plugins/polyvox_filament/ios`) EXTERNAL SOURCES: Flutter: :path: Flutter - mimetic_filament: - :path: ".symlinks/plugins/mimetic_filament/ios" + polyvox_filament: + :path: ".symlinks/plugins/polyvox_filament/ios" SPEC CHECKSUMS: - Filament: 701abb8200237da11b6f74c318f2a875ef309b91 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - mimetic_filament: 786c54c8c204e2898f9ca33c45ea7500042df62a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + polyvox_filament: 0c9b38ce090e93c769c8ee2e0f2358d0aef06cdc -PODFILE CHECKSUM: 7adbc9d59f05e1b01f554ea99b6c79e97f2214a2 +PODFILE CHECKSUM: 5016650b9e3f332aac9cd4748b5fc6034a63f552 COCOAPODS: 1.10.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 65c0553c..8fd3ca94 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -409,6 +409,12 @@ "$(inherited)", "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", ); + OTHER_CFLAGS = ( + "\"--std=c++17\"", + "\"-fmodules\"", + "\"-fcxx-modules\"", + "\"$(inherited)\"", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -558,6 +564,12 @@ "$(inherited)", "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", ); + OTHER_CFLAGS = ( + "\"--std=c++17\"", + "\"-fmodules\"", + "\"-fcxx-modules\"", + "\"$(inherited)\"", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -589,6 +601,12 @@ "$(inherited)", "${PODS_ROOT}/../.symlinks/plugins/polyvox_filament/ios/lib", ); + OTHER_CFLAGS = ( + "\"--std=c++17\"", + "\"-fmodules\"", + "\"-fcxx-modules\"", + "\"$(inherited)\"", + ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = "app.polyvox.filament-example"; PRODUCT_NAME = "$(TARGET_NAME)";