Merge branch 'feature_openxr_quest' into feature_openxr_6dof

hrydgard · Jul 26, 2022 · e5f1782 · e5f1782
2 parents 9b8a9d3 + 89f5038
commit e5f1782
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1067,14 +1067,14 @@ if(ANDROID)
 
 	if (OPENXR)
 		set(nativeExtra ${nativeExtra}
-			VR/VRBase.cpp
-			VR/VRBase.h
-			VR/VRFramebuffer.cpp
-			VR/VRFramebuffer.h
-			VR/VRInput.cpp
-			VR/VRInput.h
-			VR/VRRenderer.cpp
-			VR/VRRenderer.h
+			Common/VR/VRBase.cpp
+			Common/VR/VRBase.h
+			Common/VR/VRFramebuffer.cpp
+			Common/VR/VRFramebuffer.h
+			Common/VR/VRInput.cpp
+			Common/VR/VRInput.h
+			Common/VR/VRRenderer.cpp
+			Common/VR/VRRenderer.h
 		)
 		set(nativeExtraLibs ${nativeExtraLibs} openxr)
 	endif()

diff --git a/VR/VRBase.cpp → Common/VR/VRBase.cpp b/VR/VRBase.cpp → Common/VR/VRBase.cpp
diff --git a/VR/VRBase.h → Common/VR/VRBase.h b/VR/VRBase.h → Common/VR/VRBase.h
diff --git a/VR/VRFramebuffer.cpp → Common/VR/VRFramebuffer.cpp b/VR/VRFramebuffer.cpp → Common/VR/VRFramebuffer.cpp
diff --git a/VR/VRFramebuffer.h → Common/VR/VRFramebuffer.h b/VR/VRFramebuffer.h → Common/VR/VRFramebuffer.h
diff --git a/VR/VRInput.cpp → Common/VR/VRInput.cpp b/VR/VRInput.cpp → Common/VR/VRInput.cpp
diff --git a/VR/VRInput.h → Common/VR/VRInput.h b/VR/VRInput.h → Common/VR/VRInput.h
diff --git a/VR/VRRenderer.cpp → Common/VR/VRRenderer.cpp b/VR/VRRenderer.cpp → Common/VR/VRRenderer.cpp
diff --git a/VR/VRRenderer.h → Common/VR/VRRenderer.h b/VR/VRRenderer.h → Common/VR/VRRenderer.h