Fix for v66

BattleAxeVR · Jul 10, 2024 · f104321 · f104321
1 parent 6542cdb
commit f104321
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/src/tests/hello_xr/CMakeLists.txt b/src/tests/hello_xr/CMakeLists.txt
@@ -168,7 +168,7 @@ if(NOT ANDROID)
 
 endif()
 
-target_include_directories(hello_xr PUBLIC $ENV{OCULUS_OPENXR_MOBILE_SDK}/OpenXR/Include)
+target_include_directories(hello_xr PUBLIC $ENV{OCULUS_OPENXR_MOBILE_SDK}/OpenXR)
 target_include_directories(hello_xr PUBLIC ${PROJECT_SOURCE_DIR}/src/external/glm)
 target_include_directories(hello_xr PUBLIC ${PROJECT_SOURCE_DIR}/src/external/SDL/include)
 target_include_directories(hello_xr PUBLIC ${PROJECT_SOURCE_DIR}/src/external/Streamline/include)

diff --git a/src/tests/hello_xr/pch.h b/src/tests/hello_xr/pch.h
@@ -118,7 +118,7 @@
 #define ADD_EXTRA_CUBES 1
 
 #ifndef ENABLE_ADVANCED_FEATURES
-#define ENABLE_ADVANCED_FEATURES 0
+#define ENABLE_ADVANCED_FEATURES 1
 #endif
 
 #define THUMBSTICK_TURNING_SPEED_POWER 2.0f
@@ -128,28 +128,15 @@
 
 #if ENABLE_ADVANCED_FEATURES
 
-#include <openxr/extx1_event_channel.h>
-#include <openxr/fb_face_tracking2.h>
-#include <openxr/fb_scene.h>
-#include <openxr/fb_spatial_entity.h>
-
-#include <openxr/meta_automatic_layer_filter.h>
-
-#include <openxr/meta_body_tracking_calibration.h>
-#include <openxr/meta_body_tracking_fidelity.h>
-#include <openxr/meta_body_tracking_full_body.h>
-
-#include <openxr/meta_detached_controllers.h>
-#include <openxr/meta_environment_depth.h>
-
-#include <openxr/meta_hand_tracking_wide_motion_mode.h>
-#include <openxr/meta_recommended_layer_resolution.h>
-#include <openxr/meta_simultaneous_hands_and_controllers.h>
-
-#include <openxr/meta_spatial_entity_mesh.h>
-#include <openxr/metax1_hand_tracking_microgestures.h>
-
-#include <openxr/openxr_extension_helpers.h>
+#include <meta_openxr_preview/extx1_event_channel.h>
+#include <meta_openxr_preview/meta_body_tracking_calibration.h>
+#include <meta_openxr_preview/meta_body_tracking_fidelity.h>
+#include <meta_openxr_preview/meta_body_tracking_full_body.h>
+#include <meta_openxr_preview/meta_detached_controllers.h>
+#include <meta_openxr_preview/meta_environment_depth.h>
+#include <meta_openxr_preview/meta_hand_tracking_wide_motion_mode.h>
+#include <meta_openxr_preview/meta_simultaneous_hands_and_controllers.h>
+#include <meta_openxr_preview/openxr_extension_helpers.h>
 
 #ifdef XR_USE_PLATFORM_ANDROID
 #define PLATFORM_ANDROID 1