From ed2a1eb482eb8ba8c8acfafa0b235ea0c2b9e5b2 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 6 Jun 2024 22:14:48 +0800 Subject: [PATCH] update Android CMakeLists.txt for new native-assets build --- .../flutter_filament/android/CMakeLists.txt | 52 ++----------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/flutter_filament_federated/flutter_filament/android/CMakeLists.txt b/flutter_filament_federated/flutter_filament/android/CMakeLists.txt index d52dff40..40074bde 100644 --- a/flutter_filament_federated/flutter_filament/android/CMakeLists.txt +++ b/flutter_filament_federated/flutter_filament/android/CMakeLists.txt @@ -1,61 +1,17 @@ cmake_minimum_required(VERSION 3.10) -include_directories(../ios/src) -include_directories(../ios/include) -include_directories(../ios/include/filament) +include_directories(../../../dart_filament/native/include) include_directories(src/main/cpp) -link_directories(src/main/jniLibs/${ANDROID_ABI}) +# link_directories(src/main/jniLibs/${ANDROID_ABI}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(ANDROID_STL c++_shared) add_library(flutter_filament_android SHARED - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FlutterFilamentApi.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FlutterFilamentFFIApi.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/FilamentAndroid.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/SceneManager.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FilamentViewer.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/StreamBufferAdapter.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/TimeIt.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/camutils/Manipulator.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/camutils/Bookmark.cpp" -) - -add_library(FILAMENT_SHADERS SHARED - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/include/material/image.c" + "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/FlutterFilamentAndroid.cpp" ) target_link_libraries( flutter_filament_android - FILAMENT_SHADERS -landroid -llog - -lgltfio_core - -lfilament - -lbackend - -lgeometry - -lfilameshio - -lfilamat - -lfilabridge - -lcamutils - -lfilaflat - -ldracodec - -libl - -lktxreader - -limageio - -limage - -lutils - -ltinyexr - -lstb - -lbluevk - -lvkshaders - -luberzlib - -lsmol-v - -luberarchive - -lmeshoptimizer - -lgeometry - -lbasis_transcoder - -lGLESv3 - -lEGL - -lpng - -lz - -lzstd ) \ No newline at end of file