Update the directory layout for the vendor specific openxr sdks

m4gr3d · Mar 29, 2024 · 5c9d64f · 5c9d64f
1 parent f10bd8a
commit 5c9d64f
Show file tree

Hide file tree

Showing 41 changed files with 318 additions and 318 deletions.
diff --git a/godotopenxrkhronos/CMakeLists.txt b/godotopenxrkhronos/CMakeLists.txt
@@ -8,7 +8,7 @@ include(${CMAKE_SOURCE_DIR}/../common/CMakeLists.txt)
 project(godotopenxrvendors LANGUAGES CXX)
 
 ## khronos OpenXR loader library
-set(KHRONOS_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/libs/khronos_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
+set(KHRONOS_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/../thirdparty/khronos_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
 add_library(openxr_loader
         SHARED
         IMPORTED GLOBAL

diff --git a/godotopenxrlynx/CMakeLists.txt b/godotopenxrlynx/CMakeLists.txt
@@ -8,7 +8,7 @@ include(${CMAKE_SOURCE_DIR}/../common/CMakeLists.txt)
 project(godotopenxrvendors LANGUAGES CXX)
 
 ## lynx OpenXR loader library
-set(LYNX_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/libs/lynx_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
+set(LYNX_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/../thirdparty/lynx_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
 add_library(openxr_loader
         SHARED
         IMPORTED GLOBAL

diff --git a/godotopenxrmeta/CMakeLists.txt b/godotopenxrmeta/CMakeLists.txt
@@ -9,7 +9,7 @@ project(godotopenxrvendors LANGUAGES CXX)
 
 ## OpenXR Mobile loader library
 # Sets the path to the OpenXR mobile library directory.
-set(OPENXR_MOBILE_ROOT_DIR "${CMAKE_SOURCE_DIR}/libs/ovr_openxr_mobile_sdk/OpenXR")
+set(OPENXR_MOBILE_ROOT_DIR "${CMAKE_SOURCE_DIR}/../thirdparty/ovr_openxr_mobile_sdk/OpenXR")
 set(OPENXR_MOBILE_HEADERS_DIR "${OPENXR_MOBILE_ROOT_DIR}/Include" CACHE STRING "")
 
 set(OPENXR_MOBILE_LIB_PATH "${OPENXR_MOBILE_ROOT_DIR}/Libs/Android/${ANDROID_ABI}/${OPENXR_MOBILE_LIB_BUILD_TYPE}/libopenxr_loader.so")

diff --git a/godotopenxrmeta/README.md b/godotopenxrmeta/README.md
diff --git a/godotopenxrpico/CMakeLists.txt b/godotopenxrpico/CMakeLists.txt
@@ -8,7 +8,7 @@ include(${CMAKE_SOURCE_DIR}/../common/CMakeLists.txt)
 project(godotopenxrvendors LANGUAGES CXX)
 
 ## Pico OpenXR loader library
-set(PICO_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/libs/pico_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
+set(PICO_OPENXR_LIB_PATH "${CMAKE_SOURCE_DIR}/../thirdparty/pico_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
 add_library(openxr_loader
         SHARED
         IMPORTED GLOBAL

diff --git a/godotopenxrkhronos/LICENSE → thirdparty/khronos_openxr_sdk/LICENSE b/godotopenxrkhronos/LICENSE → thirdparty/khronos_openxr_sdk/LICENSE
diff --git a/godotopenxrkhronos/README.md → thirdparty/khronos_openxr_sdk/README.md b/godotopenxrkhronos/README.md → thirdparty/khronos_openxr_sdk/README.md
@@ -1,4 +1,4 @@
-# Godot OpenXR Khronos Android plugin
+# Khronos OpenXR Android SDK
 
 Binaries taken from the Official OpenXR working group repo at:
 https://github.com/KhronosGroup/OpenXR-SDK-Source/releases/download/release-1.0.26/openxr_loader_for_android-1.0.26.aar

diff --git a/...ibs/khronos_openxr_sdk/arm64-v8a/abi.json → ...rty/khronos_openxr_sdk/arm64-v8a/abi.json b/...ibs/khronos_openxr_sdk/arm64-v8a/abi.json → ...rty/khronos_openxr_sdk/arm64-v8a/abi.json
diff --git a/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so b/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so
diff --git a/...s/libs/khronos_openxr_sdk/x86_64/abi.json → ...dparty/khronos_openxr_sdk/x86_64/abi.json b/...s/libs/khronos_openxr_sdk/x86_64/abi.json → ...dparty/khronos_openxr_sdk/x86_64/abi.json
diff --git a/...nos_openxr_sdk/x86_64/libopenxr_loader.so → ...nos_openxr_sdk/x86_64/libopenxr_loader.so b/...nos_openxr_sdk/x86_64/libopenxr_loader.so → ...nos_openxr_sdk/x86_64/libopenxr_loader.so
diff --git a/godotopenxrlynx/LICENSE → thirdparty/lynx_openxr_sdk/LICENSE b/godotopenxrlynx/LICENSE → thirdparty/lynx_openxr_sdk/LICENSE
diff --git a/godotopenxrlynx/NOTICE.txt → thirdparty/lynx_openxr_sdk/NOTICE.txt b/godotopenxrlynx/NOTICE.txt → thirdparty/lynx_openxr_sdk/NOTICE.txt
diff --git a/godotopenxrlynx/README.md → thirdparty/lynx_openxr_sdk/README.md b/godotopenxrlynx/README.md → thirdparty/lynx_openxr_sdk/README.md
@@ -1,4 +1,4 @@
-# Godot OpenXR Lynx Android plugin
+# Lynx OpenXR SDK
 
 Binaries taken from Lynx at:
 https://portal.lynx-r.com/downloads/item/1/download/latest
diff --git a/...x/libs/lynx_openxr_sdk/arm64-v8a/abi.json → ...dparty/lynx_openxr_sdk/arm64-v8a/abi.json b/...x/libs/lynx_openxr_sdk/arm64-v8a/abi.json → ...dparty/lynx_openxr_sdk/arm64-v8a/abi.json
diff --git a/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so b/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so
diff --git a/godotopenxrmeta/LICENSE.txt → thirdparty/ovr_openxr_mobile_sdk/LICENSE.txt b/godotopenxrmeta/LICENSE.txt → thirdparty/ovr_openxr_mobile_sdk/LICENSE.txt
diff --git a/...enXR/Include/openxr/extx1_event_channel.h → ...enXR/Include/openxr/extx1_event_channel.h b/...enXR/Include/openxr/extx1_event_channel.h → ...enXR/Include/openxr/extx1_event_channel.h
diff --git a/...OpenXR/Include/openxr/fb_face_tracking2.h → ...OpenXR/Include/openxr/fb_face_tracking2.h b/...OpenXR/Include/openxr/fb_face_tracking2.h → ...OpenXR/Include/openxr/fb_face_tracking2.h
diff --git a/...bile_sdk/OpenXR/Include/openxr/fb_scene.h → ...bile_sdk/OpenXR/Include/openxr/fb_scene.h b/...bile_sdk/OpenXR/Include/openxr/fb_scene.h → ...bile_sdk/OpenXR/Include/openxr/fb_scene.h
diff --git a/...OpenXR/Include/openxr/fb_spatial_entity.h → ...OpenXR/Include/openxr/fb_spatial_entity.h b/...OpenXR/Include/openxr/fb_spatial_entity.h → ...OpenXR/Include/openxr/fb_spatial_entity.h
diff --git a/...lude/openxr/meta_automatic_layer_filter.h → ...lude/openxr/meta_automatic_layer_filter.h b/...lude/openxr/meta_automatic_layer_filter.h → ...lude/openxr/meta_automatic_layer_filter.h
diff --git a/...e/openxr/meta_body_tracking_calibration.h → ...e/openxr/meta_body_tracking_calibration.h b/...e/openxr/meta_body_tracking_calibration.h → ...e/openxr/meta_body_tracking_calibration.h
diff --git a/...lude/openxr/meta_body_tracking_fidelity.h → ...lude/openxr/meta_body_tracking_fidelity.h b/...lude/openxr/meta_body_tracking_fidelity.h → ...lude/openxr/meta_body_tracking_fidelity.h
diff --git a/...ude/openxr/meta_body_tracking_full_body.h → ...ude/openxr/meta_body_tracking_full_body.h b/...ude/openxr/meta_body_tracking_full_body.h → ...ude/openxr/meta_body_tracking_full_body.h
diff --git a/...nclude/openxr/meta_detached_controllers.h → ...nclude/openxr/meta_detached_controllers.h b/...nclude/openxr/meta_detached_controllers.h → ...nclude/openxr/meta_detached_controllers.h
diff --git a/...R/Include/openxr/meta_environment_depth.h → ...R/Include/openxr/meta_environment_depth.h b/...R/Include/openxr/meta_environment_depth.h → ...R/Include/openxr/meta_environment_depth.h
diff --git a/...nxr/meta_hand_tracking_wide_motion_mode.h → ...nxr/meta_hand_tracking_wide_motion_mode.h b/...nxr/meta_hand_tracking_wide_motion_mode.h → ...nxr/meta_hand_tracking_wide_motion_mode.h
diff --git a/...penxr/meta_recommended_layer_resolution.h → ...penxr/meta_recommended_layer_resolution.h b/...penxr/meta_recommended_layer_resolution.h → ...penxr/meta_recommended_layer_resolution.h
diff --git a/...meta_simultaneous_hands_and_controllers.h → ...meta_simultaneous_hands_and_controllers.h b/...meta_simultaneous_hands_and_controllers.h → ...meta_simultaneous_hands_and_controllers.h
diff --git a/...Include/openxr/meta_spatial_entity_mesh.h → ...Include/openxr/meta_spatial_entity_mesh.h b/...Include/openxr/meta_spatial_entity_mesh.h → ...Include/openxr/meta_spatial_entity_mesh.h
diff --git a/...enxr/metax1_hand_tracking_microgestures.h → ...enxr/metax1_hand_tracking_microgestures.h b/...enxr/metax1_hand_tracking_microgestures.h → ...enxr/metax1_hand_tracking_microgestures.h
diff --git a/...Include/openxr/openxr_extension_helpers.h → ...Include/openxr/openxr_extension_helpers.h b/...Include/openxr/openxr_extension_helpers.h → ...Include/openxr/openxr_extension_helpers.h
diff --git a/...XR/Include/openxr/openxr_oculus_helpers.h → ...XR/Include/openxr/openxr_oculus_helpers.h b/...XR/Include/openxr/openxr_oculus_helpers.h → ...XR/Include/openxr/openxr_oculus_helpers.h
diff --git a/...droid/arm64-v8a/Debug/libopenxr_loader.so → ...droid/arm64-v8a/Debug/libopenxr_loader.so b/...droid/arm64-v8a/Debug/libopenxr_loader.so → ...droid/arm64-v8a/Debug/libopenxr_loader.so
diff --git a/...oid/arm64-v8a/Release/libopenxr_loader.so → ...oid/arm64-v8a/Release/libopenxr_loader.so b/...oid/arm64-v8a/Release/libopenxr_loader.so → ...oid/arm64-v8a/Release/libopenxr_loader.so
diff --git a/...oid/armeabi-v7a/Debug/libopenxr_loader.so → ...oid/armeabi-v7a/Debug/libopenxr_loader.so b/...oid/armeabi-v7a/Debug/libopenxr_loader.so → ...oid/armeabi-v7a/Debug/libopenxr_loader.so
diff --git a/...d/armeabi-v7a/Release/libopenxr_loader.so → ...d/armeabi-v7a/Release/libopenxr_loader.so b/...d/armeabi-v7a/Release/libopenxr_loader.so → ...d/armeabi-v7a/Release/libopenxr_loader.so
diff --git a/thirdparty/ovr_openxr_mobile_sdk/README.md b/thirdparty/ovr_openxr_mobile_sdk/README.md
@@ -0,0 +1,3 @@
+# Meta OpenXR Mobile SDK
+
+Version 62 of the Meta OpenXR Mobile SDK from https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk/62.0
diff --git a/.../libs/pico_openxr_sdk/arm64-v8a/README.md → thirdparty/pico_openxr_sdk/README.md b/.../libs/pico_openxr_sdk/arm64-v8a/README.md → thirdparty/pico_openxr_sdk/README.md
diff --git a/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so b/..._openxr_sdk/arm64-v8a/libopenxr_loader.so → ..._openxr_sdk/arm64-v8a/libopenxr_loader.so
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Meta OpenXR Mobile SDK

		Version 62 of the Meta OpenXR Mobile SDK from https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk/62.0