OpenXR - Support multiple loaders

CMakeLists.txt

@@ -120,8 +120,16 @@ if(OPENXR)
 	add_definitions(-DOPENXR)
 	add_library(openxr SHARED IMPORTED)
 	include_directories(ext/openxr)
-	set_property(TARGET openxr PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/ext/openxr/libs/arm64-v8a/libopenxr_loader.so")
-	message("OpenXR enabled")
+	if(OPENXR_PLATFORM_PICO)
+	  add_definitions(-DOPENXR_PLATFORM_PICO)
+	  set_property(TARGET openxr PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/ext/openxr/libs/pico/arm64-v8a/libopenxr_loader.so")
+	  message("OpenXR for Pico enabled")
+	endif()
+	if(OPENXR_PLATFORM_QUEST)
+	  add_definitions(-DOPENXR_PLATFORM_QUEST)
+	  set_property(TARGET openxr PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/ext/openxr/libs/quest/arm64-v8a/libopenxr_loader.so")
+	  message("OpenXR for Quest enabled")
+	endif()
 endif()
 
 if(GOLD)

android/build.gradle

@@ -160,6 +160,7 @@ android {
 							'-DANDROID_CPP_FEATURES=',
 							'-DANDROID_STL=c++_static',
 							'-DANDROID_ARM_NEON=TRUE',
+							'-DOPENXR_PLATFORM_PICO=TRUE',
 							'-DOPENXR=TRUE'
 				}
 			}
@@ -179,6 +180,7 @@ android {
 							'-DANDROID_CPP_FEATURES=',
 							'-DANDROID_STL=c++_static',
 							'-DANDROID_ARM_NEON=TRUE',
+							'-DOPENXR_PLATFORM_QUEST=TRUE',
 							'-DOPENXR=TRUE'
 				}
 			}

android/src/org/ppsspp/ppsspp/NativeActivity.java

@@ -1547,6 +1547,6 @@ public void recreate() {
 	}
 
 	private boolean isVRDevice() {
-		return BuildConfig.FLAVOR.startsWith("vr_") == 0;
+		return BuildConfig.FLAVOR.startsWith("vr_");
 	}
 }