update Android CMakeLists

android/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)  
+cmake_minimum_required(VERSION 3.10)  
 
 include_directories(../ios/src)
 include_directories(../ios/include)
@@ -6,60 +6,56 @@ include_directories(../ios/include/stb)
 include_directories(src/main/cpp)
 link_directories(src/main/jniLibs/${ANDROID_ABI}) 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-add_library( 
-            filament_interop
-            SHARED
-            src/main/cpp/filament_android.cpp
-            ../ios/src/ktxreader/Ktx1Reader.cpp
-            src/main/cpp/StbProvider.cpp
-            src/main/cpp/JobSystem.cpp
-            ../ios/src/AssetManager.cpp
-            ../ios/src/FilamentViewer.cpp
-            ../ios/src/PolyvoxFilamentApi.cpp
-            ../ios/src/StreamBufferAdapter.cpp
-            ../ios/src/image/imagematerial.c
-            ../ios/src/shaders/unlitopaque.c
-            ../ios/src/SceneAsset.cpp
-        )
 
-add_library(FILAMENT_SHADERS SHARED 
-  ../ios/include/material/image.c
-  ../ios/include/material/unlitopaque.c
+add_library(polyvox_filament_android SHARED
+  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/AssetManager.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FilamentViewer.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentApi.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/StreamBufferAdapter.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/TimeIt.cpp"
 )
 
+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)
+
 target_link_libraries(
-  filament_interop 
+  polyvox_filament_android
   FILAMENT_SHADERS
-  -landroid 
-  -llog 
+  -landroid
+  -llog
+  -lgltfio_core 
   -lfilament 
   -lbackend 
-  -lfilameshio 
-  -lviewer 
-  -lfilamat 
   -lgeometry 
-  -lutils 
+  -lfilameshio 
+  -lfilamat 
   -lfilabridge 
-  -lgltfio_core 
   -lfilament-iblprefilter 
-  -limage 
   -lcamutils 
   -lfilaflat 
   -ldracodec 
   -libl 
   -lktxreader 
   -limageio
-  -lpng
+  -limage
+  -lutils 
   -ltinyexr
-  -lz
   -lstb  
-  -lEGL 
-  -lGLESv3 
   -lbluevk 
   -lvkshaders 
   -luberzlib 
   -lsmol-v 
   -luberarchive 
+  -lmeshoptimizer
+  -lgeometry
+  -lbasis_transcoder
+  -lEGL
+  -lGLESv3
+  -lpng
+  -lz
   -lzstd
-  )
-
+)