Merge pull request #103267 from YeldhamDev/reality_got_too_extended
Allow to compile the engine without XR support
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
def can_build(env, platform):
|
||||
return not env["disable_3d"]
|
||||
return not env["disable_xr"]
|
||||
|
||||
|
||||
def configure(env):
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
def can_build(env, platform):
|
||||
if platform in ("linuxbsd", "windows", "android", "macos"):
|
||||
return env["openxr"] and not env["disable_3d"]
|
||||
return not env["disable_xr"]
|
||||
else:
|
||||
# not supported on these platforms
|
||||
# Not supported on these platforms.
|
||||
return False
|
||||
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "../openxr_interface.h"
|
||||
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/xr_nodes.h"
|
||||
#include "scene/3d/xr/xr_nodes.h"
|
||||
#include "scene/main/viewport.h"
|
||||
|
||||
#include "platform/android/api/java_class_wrapper.h"
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include "../extensions/openxr_visibility_mask_extension.h"
|
||||
#include "../openxr_interface.h"
|
||||
#include "scene/3d/xr_nodes.h"
|
||||
#include "scene/3d/xr/xr_nodes.h"
|
||||
|
||||
void OpenXRVisibilityMask::_bind_methods() {
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
def can_build(env, platform):
|
||||
return env["opengl3"] and not env["disable_3d"]
|
||||
return env["opengl3"] and not env["disable_xr"]
|
||||
|
||||
|
||||
def configure(env):
|
||||
|
||||
Reference in New Issue
Block a user