diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index b011d795..28950261 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -160,6 +160,17 @@ else() set(PhysXSDK) endif() +if(USE_AR_MODULE) + set(ARSDK libAR) + add_library(libAR STATIC IMPORTED GLOBAL) + set_target_properties(libAR PROPERTIES + IMPORTED_LOCATION ${platform_spec_path}/ar/libar.a + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr + ) +else() + set(ARSDK) +endif() + if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype @@ -173,6 +184,7 @@ list(APPEND CC_EXTERNAL_LIBS uv android_platform ${PhysXSDK} + ${ARSDK} ) if(USE_JOB_SYSTEM_TBB OR CC_USE_VULKAN) ## VKDevice.cpp use tbb_allocator.h diff --git a/android/arm64-v8a/ar/libar.a b/android/arm64-v8a/ar/libar.a new file mode 100644 index 00000000..c7f19c70 Binary files /dev/null and b/android/arm64-v8a/ar/libar.a differ diff --git a/android/arm64-v8a/xr/huaweivr/libxr.a b/android/arm64-v8a/xr/huaweivr/libxr.a index 8b31b279..efd9e544 100644 Binary files a/android/arm64-v8a/xr/huaweivr/libxr.a and b/android/arm64-v8a/xr/huaweivr/libxr.a differ diff --git a/android/arm64-v8a/xr/huaweivr/libxr_loader.so b/android/arm64-v8a/xr/huaweivr/libxr_loader.so index 215fae51..a56c9b21 100644 Binary files a/android/arm64-v8a/xr/huaweivr/libxr_loader.so and b/android/arm64-v8a/xr/huaweivr/libxr_loader.so differ diff --git a/android/arm64-v8a/xr/meta/libopenxr_loader.so b/android/arm64-v8a/xr/meta/libopenxr_loader.so index f61dea92..4984b90b 100644 Binary files a/android/arm64-v8a/xr/meta/libopenxr_loader.so and b/android/arm64-v8a/xr/meta/libopenxr_loader.so differ diff --git a/android/arm64-v8a/xr/meta/libxr.a b/android/arm64-v8a/xr/meta/libxr.a index 58083675..f4885302 100644 Binary files a/android/arm64-v8a/xr/meta/libxr.a and b/android/arm64-v8a/xr/meta/libxr.a differ diff --git a/android/arm64-v8a/xr/monado/libxr.a b/android/arm64-v8a/xr/monado/libxr.a index 8cb52570..b47c2682 100644 Binary files a/android/arm64-v8a/xr/monado/libxr.a and b/android/arm64-v8a/xr/monado/libxr.a differ diff --git a/android/arm64-v8a/xr/pico/libxr.a b/android/arm64-v8a/xr/pico/libxr.a index 8141fcde..bb62414a 100644 Binary files a/android/arm64-v8a/xr/pico/libxr.a and b/android/arm64-v8a/xr/pico/libxr.a differ diff --git a/android/arm64-v8a/xr/rokid/libxr.a b/android/arm64-v8a/xr/rokid/libxr.a index 48e862fe..d3bedff6 100644 Binary files a/android/arm64-v8a/xr/rokid/libxr.a and b/android/arm64-v8a/xr/rokid/libxr.a differ diff --git a/android/arm64-v8a/xr/seed/libxr.a b/android/arm64-v8a/xr/seed/libxr.a deleted file mode 100644 index 63263a5b..00000000 Binary files a/android/arm64-v8a/xr/seed/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/spaces/libxr.a b/android/arm64-v8a/xr/spaces/libxr.a index 5e8a5e20..098d532b 100644 Binary files a/android/arm64-v8a/xr/spaces/libxr.a and b/android/arm64-v8a/xr/spaces/libxr.a differ diff --git a/android/armeabi-v7a/ar/libar.a b/android/armeabi-v7a/ar/libar.a new file mode 100644 index 00000000..31ef2972 Binary files /dev/null and b/android/armeabi-v7a/ar/libar.a differ diff --git a/android/x86_64/xr/monado/libxr.a b/android/x86_64/xr/monado/libxr.a index 86587e91..990b5488 100644 Binary files a/android/x86_64/xr/monado/libxr.a and b/android/x86_64/xr/monado/libxr.a differ diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index 759838cf..55d806c2 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -206,6 +206,17 @@ else() set(PhysXSDK) endif() +if(USE_AR_MODULE) + set(ARSDK libAR) + add_library(libAR STATIC IMPORTED GLOBAL) + set_target_properties(libAR PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/ar/libar.a + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr + ) +else() + set(ARSDK) +endif() + list(APPEND CC_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/include ) @@ -224,6 +235,7 @@ list(APPEND CC_EXTERNAL_LIBS ${spirv-cross_libs_name} ${tbb_libs_name} ${PhysXSDK} + ${ARSDK} ) set(ZLIB z) diff --git a/ios/libs/ar/libar.a b/ios/libs/ar/libar.a new file mode 100644 index 00000000..427e4e0a Binary files /dev/null and b/ios/libs/ar/libar.a differ