Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup of OpenXR module SCons config #86537

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Cleanup of OpenXR module SCons config #86537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 5 additions & 29 deletions modules/openxr/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,37 +93,13 @@ if env["builtin_openxr"]:
module_obj = []

env_openxr.add_source_files(module_obj, "*.cpp")
env_openxr.add_source_files(module_obj, "action_map/*.cpp")
env_openxr.add_source_files(module_obj, "scene/*.cpp")
env.modules_sources += module_obj

# We're a little more targeted with our extensions
if env["platform"] == "android":
env_openxr.add_source_files(module_obj, "extensions/openxr_android_extension.cpp")
if env["vulkan"]:
env_openxr.add_source_files(module_obj, "extensions/openxr_vulkan_extension.cpp")
if env["opengl3"] and env["platform"] != "macos":
env_openxr.add_source_files(module_obj, "extensions/openxr_opengl_extension.cpp")

env_openxr.add_source_files(module_obj, "extensions/openxr_local_floor_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_palm_pose_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_composition_layer_depth_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_eye_gaze_interaction.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_htc_controller_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_htc_vive_tracker_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_huawei_controller_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_hand_tracking_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_fb_foveation_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_fb_update_swapchain_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_fb_passthrough_extension_wrapper.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_fb_display_refresh_rate_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_pico_controller_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_wmr_controller_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_ml2_controller_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_extension_wrapper_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_api_extension.cpp")
env_openxr.add_source_files(module_obj, "extensions/openxr_meta_controller_extension.cpp")
Export("env_openxr")

env.modules_sources += module_obj
SConscript("action_map/SCsub")
SConscript("extensions/SCsub")
SConscript("scene/SCsub")

if env.editor_build:
SConscript("editor/SCsub")
Expand Down
10 changes: 10 additions & 0 deletions modules/openxr/action_map/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env python

Import("env")
Import("env_openxr")

module_obj = []

env_openxr.add_source_files(module_obj, "*.cpp")

env.modules_sources += module_obj
18 changes: 18 additions & 0 deletions modules/openxr/extensions/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env python

Import("env")
Import("env_openxr")

module_obj = []

env_openxr.add_source_files(module_obj, "*.cpp")

# These are platform dependent
if env["platform"] == "android":
env_openxr.add_source_files(module_obj, "platform/openxr_android_extension.cpp")
if env["vulkan"]:
env_openxr.add_source_files(module_obj, "platform/openxr_vulkan_extension.cpp")
if env["opengl3"] and env["platform"] != "macos":
env_openxr.add_source_files(module_obj, "platform/openxr_opengl_extension.cpp")

env.modules_sources += module_obj
2 changes: 1 addition & 1 deletion ...r/extensions/openxr_android_extension.cpp → ...ons/platform/openxr_android_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "openxr_android_extension.h"

#include "../openxr_api.h"
#include "../../openxr_api.h"

#include "java_godot_wrapper.h"
#include "os_android.h"
Expand Down
4 changes: 2 additions & 2 deletions ...nxr/extensions/openxr_android_extension.h → ...sions/platform/openxr_android_extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#ifndef OPENXR_ANDROID_EXTENSION_H
#define OPENXR_ANDROID_EXTENSION_H

#include "../util.h"
#include "openxr_extension_wrapper.h"
#include "../../util.h"
#include "../openxr_extension_wrapper.h"

class OpenXRAndroidExtension : public OpenXRExtensionWrapper {
public:
Expand Down
2 changes: 1 addition & 1 deletion ...xr/extensions/openxr_opengl_extension.cpp → ...ions/platform/openxr_opengl_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#ifdef GLES3_ENABLED

#include "../openxr_util.h"
#include "../../openxr_util.h"

#include "drivers/gles3/effects/copy_effects.h"
#include "drivers/gles3/storage/texture_storage.h"
Expand Down
8 changes: 4 additions & 4 deletions ...enxr/extensions/openxr_opengl_extension.h → ...nsions/platform/openxr_opengl_extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@

#ifdef GLES3_ENABLED

#include "../openxr_api.h"
#include "../util.h"
#include "openxr_extension_wrapper.h"
#include "../../openxr_api.h"
#include "../../util.h"
#include "../openxr_extension_wrapper.h"

#include "core/templates/vector.h"

// Always include this as late as possible.
#include "../openxr_platform_inc.h"
#include "../../openxr_platform_inc.h"

class OpenXROpenGLExtension : public OpenXRGraphicsExtensionWrapper {
public:
Expand Down
2 changes: 1 addition & 1 deletion ...xr/extensions/openxr_vulkan_extension.cpp → ...ions/platform/openxr_vulkan_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "openxr_vulkan_extension.h"

#include "../openxr_util.h"
#include "../../openxr_util.h"

#include "core/string/print_string.h"
#include "servers/rendering/renderer_rd/effects/copy_effects.h"
Expand Down
8 changes: 4 additions & 4 deletions ...enxr/extensions/openxr_vulkan_extension.h → ...nsions/platform/openxr_vulkan_extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
#ifndef OPENXR_VULKAN_EXTENSION_H
#define OPENXR_VULKAN_EXTENSION_H

#include "../openxr_api.h"
#include "../util.h"
#include "openxr_extension_wrapper.h"
#include "../../openxr_api.h"
#include "../../util.h"
#include "../openxr_extension_wrapper.h"

#include "core/templates/vector.h"

// Always include this as late as possible.
#include "../openxr_platform_inc.h"
#include "../../openxr_platform_inc.h"

class OpenXRVulkanExtension : public OpenXRGraphicsExtensionWrapper, VulkanHooks {
public:
Expand Down
4 changes: 2 additions & 2 deletions modules/openxr/openxr_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
#include "openxr_platform_inc.h"

#ifdef VULKAN_ENABLED
#include "extensions/openxr_vulkan_extension.h"
#include "extensions/platform/openxr_vulkan_extension.h"
#endif

#if defined(GLES3_ENABLED) && !defined(MACOS_ENABLED)
#include "extensions/openxr_opengl_extension.h"
#include "extensions/platform/openxr_opengl_extension.h"
#endif

#include "extensions/openxr_composition_layer_depth_extension.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/openxr/register_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#endif

#ifdef ANDROID_ENABLED
#include "extensions/openxr_android_extension.h"
#include "extensions/platform/openxr_android_extension.h"
#endif

#include "core/config/project_settings.h"
Expand Down
10 changes: 10 additions & 0 deletions modules/openxr/scene/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env python

Import("env")
Import("env_openxr")

module_obj = []

env_openxr.add_source_files(module_obj, "*.cpp")

env.modules_sources += module_obj
Loading