From 762f9abde0e9bcf3d3a11cc43c647ec3d51f083a Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Sun, 1 Oct 2023 16:21:37 +0800 Subject: [PATCH] update Android CMakeLists --- android/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index e4a71100..a66d9f15 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -8,7 +8,8 @@ link_directories(src/main/jniLibs/${ANDROID_ABI}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") add_library(polyvox_filament_android SHARED -"${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentApi.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentApi.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentFFIApi.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/FilamentAndroid.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/AssetManager.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FilamentViewer.cpp" @@ -18,7 +19,6 @@ add_library(polyvox_filament_android SHARED add_library(FILAMENT_SHADERS SHARED "${CMAKE_CURRENT_SOURCE_DIR}/../ios/include/material/image.c" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/include/material/unlit_opaque.c" ) include_directories(../ios/include) @@ -34,8 +34,7 @@ target_link_libraries( -lgeometry -lfilameshio -lfilamat - -lfilabridge - -lfilament-iblprefilter + -lfilabridge -lcamutils -lfilaflat -ldracodec @@ -54,8 +53,8 @@ target_link_libraries( -lmeshoptimizer -lgeometry -lbasis_transcoder - -lEGL -lGLESv3 + -lEGL -lpng -lz -lzstd