From 76f723c497025b214bb56e411f385b945483f2c1 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 9 Nov 2023 12:24:22 +0800 Subject: [PATCH] Makefile/README updates --- macos/Makefile => Makefile | 13 +++++++------ README.md | 6 +----- 2 files changed, 8 insertions(+), 11 deletions(-) rename macos/Makefile => Makefile (77%) diff --git a/macos/Makefile b/Makefile similarity index 77% rename from macos/Makefile rename to Makefile index 58d513fd..6b6f095c 100644 --- a/macos/Makefile +++ b/Makefile @@ -1,17 +1,18 @@ 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 -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} +sync-macos: FORCE + rm -rf ${current_dir}macos/include ${current_dir}macos/src + cp -R ${current_dir}ios/include ${current_dir}macos + cp -R ${current_dir}ios/src ${current_dir}macos + +FORCE: ; # We use a single material (no lighting and no transparency) for background images # diff --git a/README.md b/README.md index aa0457fd..014e45ed 100644 --- a/README.md +++ b/README.md @@ -390,13 +390,9 @@ Project structure: e.g. ``` -cd macos && make +make sync-macos ``` -- 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) --- can't symlink either? ---- IMPORTANT - current version only works on Flutter 3.15.0-15.2.pre / Filament v1.43.1 - - Note also need to specifically build imageio/png/tinyexr - if release build, then need to comment out -fno-exceptions