diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2026-07-23 02:02:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-22 18:02:58 -0600 |
| commit | 4c24ae2bc2294c96a81d296a68b6d404f34358e7 (patch) | |
| tree | 0a4d1fb0e353e1b14755d1a2c8d2fcc4d4c29b70 /src/port | |
| parent | 022e0737d598e93429355db66c07be39e974926f (diff) | |
Refactor cmake (#721)
* some start of refactor
* Update SetFlags.cmake
* Update SetCmakeVar.cmake
* Update SetFlags.cmake
* Fix error int-convertion
* more refactor
* clean up include and source file
* fix link of lib
* fix a warning
* fix include in src/actors
* fix include in src/debug
* fix include in src/ending
* fix include in src/engine/actors
* fix include in src/engine/cameras
* fix include in src/engine/editor
* fix include in src/engine/objects
* fix include in src/engine/tracks
* fix include in src/port/ui
* fix include in src/racing
* fix include in src/engine/vehicles
* fix include in subfolder of src/engine
* fix include in src/engine
* fix include in src/enhancements
* fix include in src
* fix switch
* invert common and findlib
* Update SetFlags.cmake
* clean up some workflow
* some splification
* Update build.sh
* Update Game.h
* add header back
* Delete test_check.cmake
* continue
* Update common.cmake
Diffstat (limited to 'src/port')
| -rw-r--r-- | src/port/Engine.cpp | 2 | ||||
| -rw-r--r-- | src/port/Game.cpp | 4 | ||||
| -rw-r--r-- | src/port/Game.h | 7 | ||||
| -rw-r--r-- | src/port/interpolation/FrameInterpolation.cpp | 4 | ||||
| -rw-r--r-- | src/port/ui/ContentBrowser.cpp | 14 | ||||
| -rw-r--r-- | src/port/ui/ContentBrowser.h | 2 | ||||
| -rw-r--r-- | src/port/ui/Menu.h | 2 | ||||
| -rw-r--r-- | src/port/ui/Properties.cpp | 2 | ||||
| -rw-r--r-- | src/port/ui/SceneExplorer.cpp | 2 | ||||
| -rw-r--r-- | src/port/ui/Tools.cpp | 2 | ||||
| -rw-r--r-- | src/port/ui/TrackProperties.cpp | 4 |
11 files changed, 22 insertions, 23 deletions
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 3d516130e..5b3b1bcac 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -3,7 +3,7 @@ #include <cstdlib> #include "ship/utils/StringHelper.h" #include "GameExtractor.h" -#include "mods/ModManager.h" +#include "engine/mods/ModManager.h" #include "ui/ImguiUI.h" #include "ship/Context.h" #include "ship/controller/controldevice/controller/mapping/ControllerDefaultMappings.h" diff --git a/src/port/Game.cpp b/src/port/Game.cpp index 598b31100..8ccd382e6 100644 --- a/src/port/Game.cpp +++ b/src/port/Game.cpp @@ -17,7 +17,7 @@ #include "engine/objects/BombKart.h" #include "engine/objects/Lakitu.h" -#include "Smoke.h" +#include "engine/Smoke.h" #include "engine/HM_Intro.h" @@ -42,7 +42,7 @@ extern "C" { #include "main.h" #include "audio/load.h" #include "audio/external.h" -#include "render_courses.h" +#include "racing/render_courses.h" #include "menus.h" #include "update_objects.h" #include "spawn_players.h" diff --git a/src/port/Game.h b/src/port/Game.h index 1ce73555f..63ad92a4b 100644 --- a/src/port/Game.h +++ b/src/port/Game.h @@ -229,12 +229,11 @@ void* GetCup(); void CM_RunGarbageCollector(void); void CM_ResetAudio(void); -// Add print formatting check attribute +NORETURN void CM_ThrowRuntimeError(const char* fmt, ...) #if defined(__GNUC__) || defined(__clang__) -__attribute__((format(printf, 1, 2))) + __attribute__((format(printf, 1, 2))) #endif - -NORETURN void CM_ThrowRuntimeError(const char* fmt, ...); + ; // NOLINTEND(readability-identifier-naming) diff --git a/src/port/interpolation/FrameInterpolation.cpp b/src/port/interpolation/FrameInterpolation.cpp index 1d306964d..981ef3fa6 100644 --- a/src/port/interpolation/FrameInterpolation.cpp +++ b/src/port/interpolation/FrameInterpolation.cpp @@ -11,7 +11,7 @@ #include "src/engine/CoreMath.h" extern "C" { -#include "math_util.h" +#include "racing/math_util.h" #include "math_util_2.h" #include "render_player.h" @@ -907,4 +907,4 @@ static bool invert_matrix(const float m[16], float invOut[16]) { } return true; -}
\ No newline at end of file +} diff --git a/src/port/ui/ContentBrowser.cpp b/src/port/ui/ContentBrowser.cpp index 1065007b6..3427c08c2 100644 --- a/src/port/ui/ContentBrowser.cpp +++ b/src/port/ui/ContentBrowser.cpp @@ -3,7 +3,7 @@ #include "UIWidgets.h" #include "ship/Context.h" #include "port/Engine.h" -#include "SpawnParams.h" +#include "engine/SpawnParams.h" #include <imgui.h> #include <map> @@ -14,19 +14,19 @@ #include "spdlog/formatter.h" #include <common_structs.h> #include <defines.h> -#include "CoreMath.h" -#include "World.h" -#include "AllActors.h" +#include "engine/CoreMath.h" +#include "engine/World.h" +#include "engine/AllActors.h" #include "port/Game.h" #include "src/engine/editor/SceneManager.h" #include "engine/TrackBrowser.h" -#include "World.h" +#include "engine/World.h" extern "C" { #include "common_structs.h" -#include "actors.h" -#include "collision.h" +#include "racing/actors.h" +#include "racing/collision.h" } namespace TrackEditor { diff --git a/src/port/ui/ContentBrowser.h b/src/port/ui/ContentBrowser.h index 5d4e4c338..d4097a732 100644 --- a/src/port/ui/ContentBrowser.h +++ b/src/port/ui/ContentBrowser.h @@ -2,7 +2,7 @@ #include <libultraship/libultraship.h> #include "engine/tracks/Track.h" -#include "AllActors.h" +#include "engine/AllActors.h" namespace TrackEditor { class ContentBrowserWindow : public Ship::GuiWindow { diff --git a/src/port/ui/Menu.h b/src/port/ui/Menu.h index ae34c5d21..f3b2fd3dd 100644 --- a/src/port/ui/Menu.h +++ b/src/port/ui/Menu.h @@ -13,7 +13,7 @@ extern "C" { #include "main.h" #include "menus.h" #include "code_800029B0.h" -#include "external.h" +#include "audio/external.h" } namespace Ship { diff --git a/src/port/ui/Properties.cpp b/src/port/ui/Properties.cpp index fc3eb2d1e..88974290c 100644 --- a/src/port/ui/Properties.cpp +++ b/src/port/ui/Properties.cpp @@ -20,7 +20,7 @@ #include "engine/vehicles/Train.h" extern "C" { -#include "actors.h" +#include "racing/actors.h" } namespace TrackEditor { diff --git a/src/port/ui/SceneExplorer.cpp b/src/port/ui/SceneExplorer.cpp index 980d519f0..68c670b97 100644 --- a/src/port/ui/SceneExplorer.cpp +++ b/src/port/ui/SceneExplorer.cpp @@ -15,7 +15,7 @@ #include "port/Game.h" extern "C" { -#include "actors.h" +#include "racing/actors.h" } namespace TrackEditor { diff --git a/src/port/ui/Tools.cpp b/src/port/ui/Tools.cpp index 76073abb9..741c4a838 100644 --- a/src/port/ui/Tools.cpp +++ b/src/port/ui/Tools.cpp @@ -17,7 +17,7 @@ extern "C" { #include "code_800029B0.h" #include "code_80057C60.h" -#include "actors.h" +#include "racing/actors.h" } namespace TrackEditor { diff --git a/src/port/ui/TrackProperties.cpp b/src/port/ui/TrackProperties.cpp index 18a2c4655..ccf677776 100644 --- a/src/port/ui/TrackProperties.cpp +++ b/src/port/ui/TrackProperties.cpp @@ -21,8 +21,8 @@ extern "C" { #include "code_800029B0.h" #include "sounds.h" -#include "external.h" -#include "render_courses.h" +#include "audio/external.h" +#include "racing/render_courses.h" #include "render_objects.h" } |
