Fix XR header include and don't build XRInterface.cpp if XR is disabled.

cocos · Sep 25, 2023 · 60ee7f3 · 60ee7f3
1 parent c909152
commit 60ee7f3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
@@ -726,9 +726,14 @@ elseif(ANDROID OR OHOS)
         cocos/platform/java/modules/SystemWindow.h
         cocos/platform/java/modules/SystemWindowManager.cpp
         cocos/platform/java/modules/SystemWindowManager.h
-        cocos/platform/java/modules/XRInterface.cpp
-        cocos/platform/java/modules/XRInterface.h
     )
+
+    if(USE_XR)
+        cocos_source_files(
+            cocos/platform/java/modules/XRInterface.cpp
+            cocos/platform/java/modules/XRInterface.h
+        )
+    endif()
 endif()
 
 if(ANDROID)

diff --git a/native/cocos/core/Root.cpp b/native/cocos/core/Root.cpp
@@ -30,7 +30,7 @@
 #include "platform/interfaces/modules/IScreen.h"
 #include "platform/interfaces/modules/ISystemWindow.h"
 #include "platform/interfaces/modules/ISystemWindowManager.h"
-#include "platform/java/modules/XRInterface.h"
+#include "platform/java/modules/IXRInterface.h"
 #if CC_USE_DEBUG_RENDERER
     #include "profiler/DebugRenderer.h"
 #endif

diff --git a/native/cocos/platform/android/AndroidPlatform.cpp b/native/cocos/platform/android/AndroidPlatform.cpp
@@ -42,7 +42,10 @@
 #include "platform/java/modules/SystemWindow.h"
 #include "platform/java/modules/SystemWindowManager.h"
 #include "platform/java/modules/Vibrator.h"
+
+#if CC_USE_XR
 #include "platform/java/modules/XRInterface.h"
+#endif
 
 #include "base/StringUtil.h"
 #include "engine/EngineEvents.h"

diff --git a/native/cocos/renderer/gfx-gles3/GLES3Device.cpp b/native/cocos/renderer/gfx-gles3/GLES3Device.cpp
@@ -44,7 +44,7 @@
 #include "GLES3Swapchain.h"
 #include "GLES3Texture.h"
 #include "application/ApplicationManager.h"
-#include "platform/java/modules/XRInterface.h"
+#include "platform/java/modules/IXRInterface.h"
 #include "profiler/Profiler.h"
 #include "states/GLES3GeneralBarrier.h"
 #include "states/GLES3Sampler.h"

diff --git a/native/cocos/scene/Camera.h b/native/cocos/scene/Camera.h
@@ -37,7 +37,7 @@
 #include "math/Mat4.h"
 #include "math/Vec3.h"
 #include "math/Vec4.h"
-#include "platform/java/modules/XRInterface.h"
+#include "platform/java/modules/IXRInterface.h"
 #include "renderer/gfx-base/GFXDef-common.h"
 #include "renderer/pipeline/Define.h"
 

diff --git a/native/cocos/xr/XRRemotePreviewManager.cpp b/native/cocos/xr/XRRemotePreviewManager.cpp
@@ -30,7 +30,7 @@
 #include "base/std/container/unordered_map.h"
 #include "base/std/container/vector.h"
 #include "math/Quaternion.h"
-#include "platform/java/modules/XRInterface.h"
+#include "platform/java/modules/IXRInterface.h"
 
 #if CC_USE_XR
     #include "Xr.h"