From dde060bf4d49465971e99097add6cb2e124b7154 Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Wed, 6 Apr 2022 09:20:21 -0700 Subject: [PATCH] Repair iOS build. --- ios/samples/app-template.yml | 2 +- ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj | 4 ++++ ios/samples/gltf-viewer/project.yml | 2 +- ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj | 4 ++++ ios/samples/hello-ar/project.yml | 2 +- ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj | 4 ++++ ios/samples/hello-gltf/project.yml | 2 +- ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj | 4 ++++ ios/samples/hello-pbr/project.yml | 2 +- 9 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ios/samples/app-template.yml b/ios/samples/app-template.yml index 1376446195..39419ac077 100644 --- a/ios/samples/app-template.yml +++ b/ios/samples/app-template.yml @@ -19,7 +19,7 @@ targetTemplates: - OpenGL settings: base: - OTHER_LDFLAGS: ["-lfilament", "-lbackend", "-lfilaflat", + OTHER_LDFLAGS: ["-lfilament", "-lbackend", "-lfilaflat", "-lktxreader", "-lfilabridge", "-lutils", "-lsmol-v", "-lgeometry", "-libl"] ENABLE_BITCODE: NO configs: diff --git a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj index 12602e7807..da94948fd8 100644 --- a/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj +++ b/ios/samples/gltf-viewer/gltf-viewer.xcodeproj/project.pbxproj @@ -418,6 +418,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -466,6 +467,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -576,6 +578,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -624,6 +627,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", diff --git a/ios/samples/gltf-viewer/project.yml b/ios/samples/gltf-viewer/project.yml index b10d39cc23..dc83e710f2 100644 --- a/ios/samples/gltf-viewer/project.yml +++ b/ios/samples/gltf-viewer/project.yml @@ -20,7 +20,7 @@ targets: settings: base: OTHER_LDFLAGS: ["-lgltfio_core", "-lgltfio_resources", "-limage", "-lgeometry", - "-lcamutils", "-ldracodec", "-lviewer", "-lcivetweb"] + "-lcamutils", "-ldracodec", "-lviewer", "-lcivetweb", "-lktxreader"] preBuildScripts: - path: build-resources.sh name: Build Resources diff --git a/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj b/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj index 45a2f6caf0..287f094a0b 100644 --- a/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj +++ b/ios/samples/hello-ar/hello-ar.xcodeproj/project.pbxproj @@ -286,6 +286,7 @@ "-libl", "-lfilameshio", "-lmeshoptimizer", + "-lktxreader", "-limage", ); PRODUCT_BUNDLE_IDENTIFIER = "google.filament.hello-ar"; @@ -329,6 +330,7 @@ "-libl", "-lfilameshio", "-lmeshoptimizer", + "-lktxreader", "-limage", ); PRODUCT_BUNDLE_IDENTIFIER = "google.filament.hello-ar"; @@ -431,6 +433,7 @@ "-libl", "-lfilameshio", "-lmeshoptimizer", + "-lktxreader", "-limage", ); PRODUCT_BUNDLE_IDENTIFIER = "google.filament.hello-ar"; @@ -584,6 +587,7 @@ "-libl", "-lfilameshio", "-lmeshoptimizer", + "-lktxreader", "-limage", ); PRODUCT_BUNDLE_IDENTIFIER = "google.filament.hello-ar"; diff --git a/ios/samples/hello-ar/project.yml b/ios/samples/hello-ar/project.yml index 2f31cd21ec..c4d435d2bd 100644 --- a/ios/samples/hello-ar/project.yml +++ b/ios/samples/hello-ar/project.yml @@ -10,7 +10,7 @@ targets: - sdk: ARKit.framework settings: base: - OTHER_LDFLAGS: ["-lfilameshio", "-lmeshoptimizer", "-limage"] + OTHER_LDFLAGS: ["-lfilameshio", "-lmeshoptimizer", "-limage", "-lktxreader"] preBuildScripts: - path: build-resources.sh name: Build Resources diff --git a/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj b/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj index c7e86f5d20..feaa86c28c 100644 --- a/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj +++ b/ios/samples/hello-gltf/hello-gltf.xcodeproj/project.pbxproj @@ -317,6 +317,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -362,6 +363,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -568,6 +570,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", @@ -613,6 +616,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lgltfio_core", "-lgltfio_resources", "-limage", diff --git a/ios/samples/hello-gltf/project.yml b/ios/samples/hello-gltf/project.yml index 860bfbe4a0..3efc921def 100644 --- a/ios/samples/hello-gltf/project.yml +++ b/ios/samples/hello-gltf/project.yml @@ -12,7 +12,7 @@ targets: - FilamentApp settings: base: - OTHER_LDFLAGS: ["-lgltfio_core", "-lgltfio_resources", "-limage", "-lgeometry", "-ldracodec"] + OTHER_LDFLAGS: ["-lgltfio_core", "-lgltfio_resources", "-limage", "-lgeometry", "-ldracodec", "-lktxreader"] preBuildScripts: - path: build-resources.sh name: Build Resources diff --git a/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj b/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj index 86d827a4a6..db39da4143 100644 --- a/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj +++ b/ios/samples/hello-pbr/hello-pbr.xcodeproj/project.pbxproj @@ -298,6 +298,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lfilameshio", "-lmeshoptimizer", "-limage", @@ -341,6 +342,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lfilameshio", "-lmeshoptimizer", "-limage", @@ -384,6 +386,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lfilameshio", "-lmeshoptimizer", "-limage", @@ -529,6 +532,7 @@ "-lsmol-v", "-lgeometry", "-libl", + "-lktxreader", "-lfilameshio", "-lmeshoptimizer", "-limage", diff --git a/ios/samples/hello-pbr/project.yml b/ios/samples/hello-pbr/project.yml index 9e05f71059..7e219ed34f 100644 --- a/ios/samples/hello-pbr/project.yml +++ b/ios/samples/hello-pbr/project.yml @@ -8,7 +8,7 @@ targets: - FilamentApp settings: base: - OTHER_LDFLAGS: ["-lfilameshio", "-lmeshoptimizer", "-limage"] + OTHER_LDFLAGS: ["-lfilameshio", "-lmeshoptimizer", "-limage", "-lktxreader"] preBuildScripts: - path: build-resources.sh name: Build Resources