diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-10-29 12:56:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-29 12:56:57 -0400 |
| commit | 83921dc012588c520efe0ed8c7ac1406806543c7 (patch) | |
| tree | ea7fe0574360788e800f24ee151489ddc30df411 /mm/2s2h/DeveloperTools | |
| parent | 0bdb407d589c5d4fe00496d2c8f65e97e911ad2f (diff) | |
Bump LUS and OTRExporter, add null audio backend (#1289)
* Bump LUS and OTRExporter, add null audio backend
* Missed an include change
* And again
* Thanks macOS
* Another one
* Bump LUS again, fixing SDL audio backend bug
* Sync LUS bump changes to merged PRs
* Bump LUS again
* Update CMakeLists.txt includes
Diffstat (limited to 'mm/2s2h/DeveloperTools')
| -rw-r--r-- | mm/2s2h/DeveloperTools/ActorViewer.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/BetterMapSelect.c | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/CollisionViewer.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/DebugConsole.cpp | 6 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/DeveloperTools.cpp | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/EventLog.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/HookDebugger.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/SaveEditor.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/DeveloperTools/WarpPoint.cpp | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/mm/2s2h/DeveloperTools/ActorViewer.h b/mm/2s2h/DeveloperTools/ActorViewer.h index 1b6632859..39a585d5b 100644 --- a/mm/2s2h/DeveloperTools/ActorViewer.h +++ b/mm/2s2h/DeveloperTools/ActorViewer.h @@ -1,6 +1,6 @@ #pragma once -#include "GuiWindow.h" +#include <ship/window/gui/GuiWindow.h> class ActorViewerWindow : public Ship::GuiWindow { public: diff --git a/mm/2s2h/DeveloperTools/BetterMapSelect.c b/mm/2s2h/DeveloperTools/BetterMapSelect.c index f0fe5c03a..8b03130c6 100644 --- a/mm/2s2h/DeveloperTools/BetterMapSelect.c +++ b/mm/2s2h/DeveloperTools/BetterMapSelect.c @@ -2,7 +2,7 @@ #include "BetterMapSelect.h" #include "overlays/gamestates/ovl_file_choose/z_file_select.h" #include "overlays/gamestates/ovl_select/z_select.h" -#include "public/bridge/consolevariablebridge.h" +#include <libultraship/bridge/consolevariablebridge.h> void BetterMapSelect_LoadGame(MapSelectState* mapSelectState, u32 entrance, s32 spawn); void BetterMapSelect_LoadFileSelect(MapSelectState* mapSelectState); diff --git a/mm/2s2h/DeveloperTools/CollisionViewer.h b/mm/2s2h/DeveloperTools/CollisionViewer.h index 399663717..c25f999d6 100644 --- a/mm/2s2h/DeveloperTools/CollisionViewer.h +++ b/mm/2s2h/DeveloperTools/CollisionViewer.h @@ -1,7 +1,7 @@ #pragma once #ifdef __cplusplus -#include "GuiWindow.h" +#include <ship/window/gui/GuiWindow.h> extern "C" { #endif diff --git a/mm/2s2h/DeveloperTools/DebugConsole.cpp b/mm/2s2h/DeveloperTools/DebugConsole.cpp index 659691f91..56dd33bdd 100644 --- a/mm/2s2h/DeveloperTools/DebugConsole.cpp +++ b/mm/2s2h/DeveloperTools/DebugConsole.cpp @@ -1,8 +1,8 @@ #include "DebugConsole.h" -#include "public/bridge/consolevariablebridge.h" -#include "Window.h" -#include "ConsoleWindow.h" +#include <libultraship/bridge/consolevariablebridge.h> +#include <ship/window/Window.h> +#include <ship/window/gui/ConsoleWindow.h> #include "2s2h/BenPort.h" #include <vector> #include <string> diff --git a/mm/2s2h/DeveloperTools/DeveloperTools.cpp b/mm/2s2h/DeveloperTools/DeveloperTools.cpp index 26ec441a7..2bcaeb9e8 100644 --- a/mm/2s2h/DeveloperTools/DeveloperTools.cpp +++ b/mm/2s2h/DeveloperTools/DeveloperTools.cpp @@ -1,6 +1,6 @@ #include "DeveloperTools.h" #include "BenPort.h" -#include "public/bridge/consolevariablebridge.h" +#include <libultraship/bridge/consolevariablebridge.h> #include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/ShipInit.hpp" diff --git a/mm/2s2h/DeveloperTools/EventLog.h b/mm/2s2h/DeveloperTools/EventLog.h index b28d95da8..400dac88f 100644 --- a/mm/2s2h/DeveloperTools/EventLog.h +++ b/mm/2s2h/DeveloperTools/EventLog.h @@ -1,6 +1,6 @@ #pragma once -#include "GuiWindow.h" +#include <ship/window/gui/GuiWindow.h> class EventLogWindow : public Ship::GuiWindow { public: diff --git a/mm/2s2h/DeveloperTools/HookDebugger.h b/mm/2s2h/DeveloperTools/HookDebugger.h index f1d887d45..f5b928179 100644 --- a/mm/2s2h/DeveloperTools/HookDebugger.h +++ b/mm/2s2h/DeveloperTools/HookDebugger.h @@ -1,7 +1,7 @@ #ifndef HOOK_DEBUGGER_H #define HOOK_DEBUGGER_H -#include "GuiWindow.h" +#include <ship/window/gui/GuiWindow.h> class HookDebuggerWindow : public Ship::GuiWindow { public: diff --git a/mm/2s2h/DeveloperTools/SaveEditor.h b/mm/2s2h/DeveloperTools/SaveEditor.h index f45ffc25c..dcf458d91 100644 --- a/mm/2s2h/DeveloperTools/SaveEditor.h +++ b/mm/2s2h/DeveloperTools/SaveEditor.h @@ -1,6 +1,6 @@ #pragma once -#include <GuiWindow.h> +#include <ship/window/gui/GuiWindow.h> #include <vector> extern "C" { diff --git a/mm/2s2h/DeveloperTools/WarpPoint.cpp b/mm/2s2h/DeveloperTools/WarpPoint.cpp index 94ec2c141..fa5cd9b63 100644 --- a/mm/2s2h/DeveloperTools/WarpPoint.cpp +++ b/mm/2s2h/DeveloperTools/WarpPoint.cpp @@ -1,5 +1,5 @@ #include "2s2h/BenGui/UIWidgets.hpp" -#include "window/gui/IconsFontAwesome4.h" +#include <ship/window/gui/IconsFontAwesome4.h> #include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/DeveloperTools/DeveloperTools.h" #include "2s2h/ShipInit.hpp" |