diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 28950261..e179f9fc 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -63,35 +63,6 @@ target_include_directories(android_platform PUBLIC # android log dl # ) -if(USE_XR) - include(${CMAKE_CURRENT_LIST_DIR}/xr.cmake) - if(BUILD_XR_NATIVE) - list(APPEND XR_EXTERNAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr/Xr.h) - list(APPEND XR_EXTERNAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules/XRCommon.h) - list(APPEND XR_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr) - list(APPEND XR_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules) - include(${CMAKE_CURRENT_LIST_DIR}/../../../../CCOpenXR/internal/CMakeLists.txt) - else() - add_library(xr STATIC IMPORTED GLOBAL) - set_target_properties(xr PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/xr/${XR_FOLDER}/libxr.a - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr - ) - - set_property(TARGET xr APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules - ) - - target_link_libraries(xr INTERFACE - ${XR_EXTERNAL_LIBS} - ) - endif() - - list(APPEND CC_EXTERNAL_LIBS - xr - ) -endif() - set(se_libs_name) if(USE_SE_V8) @@ -160,17 +131,6 @@ 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 @@ -184,7 +144,6 @@ 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 deleted file mode 100644 index 11463ad0..00000000 Binary files a/android/arm64-v8a/ar/libar.a and /dev/null differ diff --git a/android/arm64-v8a/xr/huaweivr/libxr.a b/android/arm64-v8a/xr/huaweivr/libxr.a deleted file mode 100644 index dab10309..00000000 Binary files a/android/arm64-v8a/xr/huaweivr/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/huaweivr/libxr_loader.so b/android/arm64-v8a/xr/huaweivr/libxr_loader.so deleted file mode 100644 index a56c9b21..00000000 Binary files a/android/arm64-v8a/xr/huaweivr/libxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/meta/libopenxr_loader.so b/android/arm64-v8a/xr/meta/libopenxr_loader.so deleted file mode 100644 index 4984b90b..00000000 Binary files a/android/arm64-v8a/xr/meta/libopenxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/meta/libxr.a b/android/arm64-v8a/xr/meta/libxr.a deleted file mode 100644 index 8447201a..00000000 Binary files a/android/arm64-v8a/xr/meta/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/monado/libopenxr_loader.so b/android/arm64-v8a/xr/monado/libopenxr_loader.so deleted file mode 100644 index 7e02e283..00000000 Binary files a/android/arm64-v8a/xr/monado/libopenxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/monado/libxr.a b/android/arm64-v8a/xr/monado/libxr.a deleted file mode 100644 index 0ec991f2..00000000 Binary files a/android/arm64-v8a/xr/monado/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/pico/libopenxr_loader.so b/android/arm64-v8a/xr/pico/libopenxr_loader.so deleted file mode 100644 index 784337e6..00000000 Binary files a/android/arm64-v8a/xr/pico/libopenxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/pico/libxr.a b/android/arm64-v8a/xr/pico/libxr.a deleted file mode 100644 index 8364dc84..00000000 Binary files a/android/arm64-v8a/xr/pico/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/rokid/libopenxr_loader.so b/android/arm64-v8a/xr/rokid/libopenxr_loader.so deleted file mode 100644 index 976da7fb..00000000 Binary files a/android/arm64-v8a/xr/rokid/libopenxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/rokid/libxr.a b/android/arm64-v8a/xr/rokid/libxr.a deleted file mode 100644 index 920ff3bd..00000000 Binary files a/android/arm64-v8a/xr/rokid/libxr.a and /dev/null differ diff --git a/android/arm64-v8a/xr/spaces/libopenxr_loader.so b/android/arm64-v8a/xr/spaces/libopenxr_loader.so deleted file mode 100644 index 2085b1b2..00000000 Binary files a/android/arm64-v8a/xr/spaces/libopenxr_loader.so and /dev/null differ diff --git a/android/arm64-v8a/xr/spaces/libxr.a b/android/arm64-v8a/xr/spaces/libxr.a deleted file mode 100644 index a6ad1004..00000000 Binary files a/android/arm64-v8a/xr/spaces/libxr.a and /dev/null differ diff --git a/android/armeabi-v7a/ar/libar.a b/android/armeabi-v7a/ar/libar.a deleted file mode 100644 index 02623d47..00000000 Binary files a/android/armeabi-v7a/ar/libar.a and /dev/null differ diff --git a/android/x86_64/xr/monado/libopenxr_loader.so b/android/x86_64/xr/monado/libopenxr_loader.so deleted file mode 100644 index a5cd4ada..00000000 Binary files a/android/x86_64/xr/monado/libopenxr_loader.so and /dev/null differ diff --git a/android/x86_64/xr/monado/libxr.a b/android/x86_64/xr/monado/libxr.a deleted file mode 100644 index a7fe6648..00000000 Binary files a/android/x86_64/xr/monado/libxr.a and /dev/null differ diff --git a/android/xr.cmake b/android/xr.cmake deleted file mode 100644 index 8ccd4e42..00000000 --- a/android/xr.cmake +++ /dev/null @@ -1,117 +0,0 @@ - - -################################# options ############################################ -# default fallback options -cc_set_if_undefined(BUILD_XR_NATIVE OFF) -cc_set_if_undefined(XR_OEM_META OFF) -cc_set_if_undefined(XR_OEM_HUAWEIVR OFF) -cc_set_if_undefined(XR_OEM_PICO OFF) -cc_set_if_undefined(XR_OEM_ROKID OFF) -cc_set_if_undefined(XR_OEM_SEED OFF) -cc_set_if_undefined(XR_OEM_SNAPDRAGON_SPACES OFF) -cc_set_if_undefined(XR_USE_GRAPHICS_API_OPENGL_ES ON) -cc_set_if_undefined(XR_USE_GRAPHICS_API_VULKAN ON) -cc_set_if_undefined(XR_USE_GRAPHICS_API_OPENGL OFF) -cc_set_if_undefined(XR_USE_GRAPHICS_API_D3D11 OFF) -cc_set_if_undefined(XR_USE_GRAPHICS_API_D3D12 OFF) - - -# Several files use these compile time platform switches -if(WIN32) - cc_set_if_undefined(XR_USE_PLATFORM_WIN32 ON) -elseif(ANDROID) - cc_set_if_undefined(XR_USE_PLATFORM_ANDROID ON) -elseif(PRESENTATION_BACKEND MATCHES "xlib") - cc_set_if_undefined(XR_USE_PLATFORM_XLIB ON) -elseif(PRESENTATION_BACKEND MATCHES "xcb") - cc_set_if_undefined(XR_USE_PLATFORM_XCB ON) -elseif(PRESENTATION_BACKEND MATCHES "wayland") - cc_set_if_undefined(XR_USE_PLATFORM_WAYLAND ON) -endif() - - -################################# list all option values ############################## -cc_inspect_values( - BUILD_XR_NATIVE - XR_OEM_META - XR_OEM_HUAWEIVR - XR_OEM_PICO - XR_OEM_ROKID - XR_OEM_SEED - XR_OEM_SNAPDRAGON_SPACES - XR_USE_GRAPHICS_API_OPENGL_ES - XR_USE_GRAPHICS_API_VULKAN - XR_USE_GRAPHICS_API_OPENGL - XR_USE_GRAPHICS_API_D3D11 - XR_USE_GRAPHICS_API_D3D12 - XR_USE_PLATFORM_WIN32 - XR_USE_PLATFORM_ANDROID - XR_USE_PLATFORM_XLIB - XR_USE_PLATFORM_XCB - XR_USE_PLATFORM_WAYLAND -) - - -################################# cc_xr_apply_definations ################################### -function(cc_xr_apply_definations target) - target_compile_definitions(${target} PUBLIC - $,XR_OEM_META=1,XR_OEM_META=0> - $,XR_OEM_HUAWEIVR=1,XR_OEM_HUAWEIVR=0> - $,XR_OEM_PICO=1,XR_OEM_PICO=0> - $,XR_OEM_ROKID=1,XR_OEM_ROKID=0> - $,XR_OEM_SEED=1,XR_OEM_SEED=0> - $,XR_OEM_SNAPDRAGON_SPACES=1,XR_OEM_SNAPDRAGON_SPACES=0> - $<$:XR_USE_GRAPHICS_API_OPENGL_ES=1> - $<$:XR_USE_GRAPHICS_API_VULKAN=1> - $<$:XR_USE_GRAPHICS_API_OPENGL=1> - $<$:XR_USE_GRAPHICS_API_D3D11=1> - $<$:XR_USE_GRAPHICS_API_D3D12=1> - $<$:XR_USE_PLATFORM_WIN32=1> - $<$:XR_USE_PLATFORM_ANDROID=1> - $<$:XR_USE_PLATFORM_XLIB=1> - $<$:XR_USE_PLATFORM_XCB=1> - $<$:XR_USE_PLATFORM_WAYLAND=1> - ) -endfunction() - -set(XR_EXTERNAL_LIBS) -set(XR_EXTERNAL_INCLUDES) -set(XR_EXTERNAL_SOURCES) - -list(APPEND XR_EXTERNAL_INCLUDES - ${CMAKE_CURRENT_LIST_DIR} -) - -set(XR_OEM_LOADER_NAME openxr_loader) -if(XR_OEM_META) - set(XR_OEM_FOLDER meta) - set(XR_FOLDER meta) -elseif(XR_OEM_HUAWEIVR) - set(XR_OEM_FOLDER huaweivr) - set(XR_OEM_LOADER_NAME xr_loader) - set(XR_FOLDER huaweivr) -elseif(XR_OEM_PICO) - set(XR_OEM_FOLDER pico) - set(XR_FOLDER pico) -elseif(XR_OEM_ROKID) - set(XR_OEM_FOLDER rokid) - set(XR_FOLDER rokid) -elseif(XR_OEM_SEED) - set(XR_OEM_FOLDER monado) - set(XR_FOLDER seed) -elseif(XR_OEM_SNAPDRAGON_SPACES) - set(XR_OEM_FOLDER spaces) - set(XR_FOLDER spaces) -else() - set(XR_OEM_FOLDER monado) - set(XR_FOLDER monado) -endif() - -add_library(openxr SHARED IMPORTED GLOBAL) -set_target_properties(openxr PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/xr/${XR_OEM_FOLDER}/lib${XR_OEM_LOADER_NAME}.so -) - -list(APPEND XR_EXTERNAL_LIBS - openxr -) diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index 55d806c2..759838cf 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -206,17 +206,6 @@ 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 ) @@ -235,7 +224,6 @@ 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 deleted file mode 100644 index ddd50e27..00000000 Binary files a/ios/libs/ar/libar.a and /dev/null differ