From a1f2b245ffb65e42e49d02dd76461f822f7e610d Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 9 Nov 2023 12:12:04 +0800 Subject: [PATCH] move Makefile to macos folder and update instructions --- README.md | 2 +- example/macos/Podfile.lock | 2 +- makefile => macos/Makefile | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) rename makefile => macos/Makefile (72%) diff --git a/README.md b/README.md index 4e0cf904..aa0457fd 100644 --- a/README.md +++ b/README.md @@ -390,7 +390,7 @@ Project structure: e.g. ``` -make sync-libs-macos-and-update-pods +cd macos && make ``` - Android keeps a separate copy of ALL headers (because it's currently running a different version of Filament, earlier versions have some texture filtering issues) diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 9d721f3c..b5155056 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -20,7 +20,7 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin SPEC CHECKSUMS: - flutter_filament: e47abb28417d10183c856a132777e3ca08d1551d + flutter_filament: ddf9db01d70cce6c8f3a34f414562ebdb43c7f36 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 diff --git a/makefile b/macos/Makefile similarity index 72% rename from makefile rename to macos/Makefile index 8541552e..58d513fd 100644 --- a/makefile +++ b/macos/Makefile @@ -1,17 +1,17 @@ mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) current_dir := $(dir $(mkfile_path)) -parent_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..) +parent_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/../..) filament_build_out := $(parent_dir)/filament/out/cmake-release # building on MacOS, we currently just delete the macos/include # and macos/src directories and copy from iOS -sync-libs-macos: - @rm -r ${current_dir}macos/include || echo "macos/include does not exist" - cp -R ${current_dir}ios/include ${current_dir}macos - @rm -r ${current_dir}macos/src || echo "macos/src does not exist" - cp -R ${current_dir}ios/src ${current_dir}macos +macos: + rm -rf ${current_dir}include + cp -R ${current_dir}../ios/include ${current_dir} + rm -rf ${current_dir}macos/src + cp -R ${current_dir}../ios/src ${current_dir} # We use a single material (no lighting and no transparency) for background images #