From 6d2fdac89f4f2de22ebc17563bb3a5bac33e59e3 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sun, 24 May 2020 13:31:14 -0600 Subject: [PATCH] Prefix headset implementation files with headset_; --- CMakeLists.txt | 16 ++++++++-------- Tupfile | 16 ++++++++-------- .../headset/{desktop.c => headset_desktop.c} | 0 src/modules/headset/{leap.c => headset_leap.c} | 0 .../headset/{oculus.c => headset_oculus.c} | 0 .../{oculus_mobile.c => headset_oculus_mobile.c} | 0 .../headset/{openvr.c => headset_openvr.c} | 0 .../headset/{openxr.c => headset_openxr.c} | 0 src/modules/headset/{webvr.c => headset_webvr.c} | 0 src/modules/headset/{webxr.c => headset_webxr.c} | 0 10 files changed, 16 insertions(+), 16 deletions(-) rename src/modules/headset/{desktop.c => headset_desktop.c} (100%) rename src/modules/headset/{leap.c => headset_leap.c} (100%) rename src/modules/headset/{oculus.c => headset_oculus.c} (100%) rename src/modules/headset/{oculus_mobile.c => headset_oculus_mobile.c} (100%) rename src/modules/headset/{openvr.c => headset_openvr.c} (100%) rename src/modules/headset/{openxr.c => headset_openxr.c} (100%) rename src/modules/headset/{webvr.c => headset_webvr.c} (100%) rename src/modules/headset/{webxr.c => headset_webxr.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71defc02..4df981a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,38 +445,38 @@ if(LOVR_ENABLE_HEADSET) if(LOVR_USE_OPENVR) add_definitions(-DLOVR_USE_OPENVR) - target_sources(lovr PRIVATE src/modules/headset/openvr.c) + target_sources(lovr PRIVATE src/modules/headset/headset_openvr.c) if(UNIX) target_compile_options(lovr PRIVATE -Wno-typedef-redefinition) endif() endif() if(LOVR_USE_OPENXR) add_definitions(-DLOVR_USE_OPENXR) - target_sources(lovr PRIVATE src/modules/headset/openxr.c) + target_sources(lovr PRIVATE src/modules/headset/headset_openxr.c) endif() if(LOVR_USE_OCULUS) add_definitions(-DLOVR_USE_OCULUS) - target_sources(lovr PRIVATE src/modules/headset/oculus.c) + target_sources(lovr PRIVATE src/modules/headset/headset_oculus.c) endif() if(LOVR_USE_OCULUS_MOBILE) add_definitions(-DLOVR_USE_OCULUS_MOBILE) - target_sources(lovr PRIVATE src/modules/headset/oculus_mobile.c) + target_sources(lovr PRIVATE src/modules/headset/headset_oculus_mobile.c) endif() if(LOVR_USE_WEBVR) add_definitions(-DLOVR_USE_WEBVR) - target_sources(lovr PRIVATE src/modules/headset/webvr.c) + target_sources(lovr PRIVATE src/modules/headset/headset_webvr.c) endif() if(LOVR_USE_WEBXR) add_definitions(-DLOVR_USE_WEBXR) - target_sources(lovr PRIVATE src/modules/headset/webxr.c) + target_sources(lovr PRIVATE src/modules/headset/headset_webxr.c) endif() if(LOVR_USE_DESKTOP_HEADSET) add_definitions(-DLOVR_USE_DESKTOP_HEADSET) - target_sources(lovr PRIVATE src/modules/headset/desktop.c) + target_sources(lovr PRIVATE src/modules/headset/headset_desktop.c) endif() if(LOVR_USE_LEAP) add_definitions(-DLOVR_USE_LEAP) - target_sources(lovr PRIVATE src/modules/headset/leap.c) + target_sources(lovr PRIVATE src/modules/headset/headset_leap.c) endif() endif() diff --git a/Tupfile b/Tupfile index d778de2d..5eb620cb 100644 --- a/Tupfile +++ b/Tupfile @@ -21,14 +21,14 @@ SRC_@(EVENT) += src/modules/event/*.c SRC_@(FILESYSTEM) += src/modules/filesystem/*.c SRC_@(GRAPHICS) += src/modules/graphics/*.c SRC_@(HEADSET) += src/modules/headset/headset.c -SRC_@(HEADSET)@(SIMULATOR) += src/modules/headset/desktop.c -SRC_@(HEADSET)@(OPENVR) += src/modules/headset/openvr.c -SRC_@(HEADSET)@(OPENXR) += src/modules/headset/openxr.c -SRC_@(HEADSET)@(OCULUS) += src/modules/headset/oculus.c -SRC_@(HEADSET)@(VRAPI) += src/modules/headset/oculus_mobile.c -SRC_@(HEADSET)@(WEBVR) += src/modules/headset/webvr.c -SRC_@(HEADSET)@(WEBXR) += src/modules/headset/webxr.c -SRC_@(HEADSET)@(LEAP) += src/modules/headset/leap.c +SRC_@(HEADSET)@(SIMULATOR) += src/modules/headset/headset_desktop.c +SRC_@(HEADSET)@(OPENVR) += src/modules/headset/headset_openvr.c +SRC_@(HEADSET)@(OPENXR) += src/modules/headset/headset_openxr.c +SRC_@(HEADSET)@(OCULUS) += src/modules/headset/headset_oculus.c +SRC_@(HEADSET)@(VRAPI) += src/modules/headset/headset_oculus_mobile.c +SRC_@(HEADSET)@(WEBVR) += src/modules/headset/headset_webvr.c +SRC_@(HEADSET)@(WEBXR) += src/modules/headset/headset_webxr.c +SRC_@(HEADSET)@(LEAP) += src/modules/headset/headset_leap.c SRC_@(MATH) += src/modules/math/*.c SRC_@(PHYSICS) += src/modules/physics/*.c SRC_@(THREAD) += src/modules/thread/*.c diff --git a/src/modules/headset/desktop.c b/src/modules/headset/headset_desktop.c similarity index 100% rename from src/modules/headset/desktop.c rename to src/modules/headset/headset_desktop.c diff --git a/src/modules/headset/leap.c b/src/modules/headset/headset_leap.c similarity index 100% rename from src/modules/headset/leap.c rename to src/modules/headset/headset_leap.c diff --git a/src/modules/headset/oculus.c b/src/modules/headset/headset_oculus.c similarity index 100% rename from src/modules/headset/oculus.c rename to src/modules/headset/headset_oculus.c diff --git a/src/modules/headset/oculus_mobile.c b/src/modules/headset/headset_oculus_mobile.c similarity index 100% rename from src/modules/headset/oculus_mobile.c rename to src/modules/headset/headset_oculus_mobile.c diff --git a/src/modules/headset/openvr.c b/src/modules/headset/headset_openvr.c similarity index 100% rename from src/modules/headset/openvr.c rename to src/modules/headset/headset_openvr.c diff --git a/src/modules/headset/openxr.c b/src/modules/headset/headset_openxr.c similarity index 100% rename from src/modules/headset/openxr.c rename to src/modules/headset/headset_openxr.c diff --git a/src/modules/headset/webvr.c b/src/modules/headset/headset_webvr.c similarity index 100% rename from src/modules/headset/webvr.c rename to src/modules/headset/headset_webvr.c diff --git a/src/modules/headset/webxr.c b/src/modules/headset/headset_webxr.c similarity index 100% rename from src/modules/headset/webxr.c rename to src/modules/headset/headset_webxr.c