feat: update xr platform library and add ar platform library (#319)

cocos · Nov 23, 2022 · 23cbc65 · 23cbc65
1 parent 8069d97
commit 23cbc65
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 0 deletions.
diff --git 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
diff --git a/android/arm64-v8a/xr/huaweivr/libxr.a b/android/arm64-v8a/xr/huaweivr/libxr.a
diff --git a/android/arm64-v8a/xr/huaweivr/libxr_loader.so b/android/arm64-v8a/xr/huaweivr/libxr_loader.so
diff --git a/android/arm64-v8a/xr/meta/libopenxr_loader.so b/android/arm64-v8a/xr/meta/libopenxr_loader.so
diff --git a/android/arm64-v8a/xr/meta/libxr.a b/android/arm64-v8a/xr/meta/libxr.a
diff --git a/android/arm64-v8a/xr/monado/libxr.a b/android/arm64-v8a/xr/monado/libxr.a
diff --git a/android/arm64-v8a/xr/pico/libxr.a b/android/arm64-v8a/xr/pico/libxr.a
diff --git a/android/arm64-v8a/xr/rokid/libxr.a b/android/arm64-v8a/xr/rokid/libxr.a
diff --git a/android/arm64-v8a/xr/seed/libxr.a b/android/arm64-v8a/xr/seed/libxr.a
diff --git a/android/arm64-v8a/xr/spaces/libxr.a b/android/arm64-v8a/xr/spaces/libxr.a
diff --git a/android/armeabi-v7a/ar/libar.a b/android/armeabi-v7a/ar/libar.a
diff --git a/android/x86_64/xr/monado/libxr.a b/android/x86_64/xr/monado/libxr.a
diff --git 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