Skip to content

Commit 7f1f4e4

Browse files
committed
Merge pull request godotengine#104978 from beicause/fix-disable-xr-compilation
Fix compiling with `disable_xr=yes` when 3d enabled
2 parents d56efcd + 31c191e commit 7f1f4e4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ static PhysicsServer2D *physics_server_2d = nullptr;
184184
static PhysicsServer3DManager *physics_server_3d_manager = nullptr;
185185
static PhysicsServer3D *physics_server_3d = nullptr;
186186
#endif // PHYSICS_3D_DISABLED
187-
#ifndef _3D_DISABLED
187+
#ifndef XR_DISABLED
188188
static XRServer *xr_server = nullptr;
189-
#endif // _3D_DISABLED
189+
#endif // XR_DISABLED
190190
// We error out if setup2() doesn't turn this true
191191
static bool _start_success = false;
192192

@@ -4919,11 +4919,11 @@ void Main::cleanup(bool p_force) {
49194919

49204920
EngineDebugger::deinitialize();
49214921

4922-
#ifndef _3D_DISABLED
4922+
#ifndef XR_DISABLED
49234923
if (xr_server) {
49244924
memdelete(xr_server);
49254925
}
4926-
#endif // _3D_DISABLED
4926+
#endif // XR_DISABLED
49274927

49284928
if (audio_server) {
49294929
audio_server->finish();

0 commit comments

Comments
 (0)