Skip to content

Commit

Permalink
run rename_headers.py
Browse files Browse the repository at this point in the history
  • Loading branch information
briaguya-ai committed Jan 11, 2025
1 parent 1dd124a commit 3c16024
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/audio/SDLAudioPlayer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include "AudioPlayer.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>

namespace Ship {
class SDLAudioPlayer : public AudioPlayer {
Expand Down
4 changes: 2 additions & 2 deletions src/controller/controldevice/controller/Controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <algorithm>
#include "public/bridge/consolevariablebridge.h"
#if __APPLE__
#include <SDL_events.h>
#include <SDL3/SDL_events.h>
#else
#include <SDL2/SDL_events.h>
#include <SDL3/SDL_events.h>
#endif
#include <spdlog/spdlog.h>
#include "utils/StringHelper.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <cstdint>
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <memory>
#include <string>
#include "controller/controldevice/controller/mapping/ControllerMapping.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ControllerDisconnectedWindow.h"
#include "utils/StringHelper.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <algorithm>
#include "Context.h"

Expand Down
2 changes: 1 addition & 1 deletion src/controller/deviceindex/ControllerReorderingWindow.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ControllerReorderingWindow.h"
#include "utils/StringHelper.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <algorithm>
#include "Context.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ShipDeviceIndexMappingManager.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include "utils/StringHelper.h"
#include "public/bridge/consolevariablebridge.h"
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/debug/CrashHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <dlfcn.h> // for dladdr
#include <execinfo.h>
#include <unistd.h>
#include <SDL.h>
#include <SDL3/SDL.h>
#endif

#if _WIN32
Expand Down
2 changes: 1 addition & 1 deletion src/graphic/Fast3D/gfx_metal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define CA_PRIVATE_IMPLEMENTATION
#define MTL_PRIVATE_IMPLEMENTATION
#include <Metal/Metal.hpp>
#include <SDL_render.h>
#include <SDL3/SDL_render.h>
#include <imgui_impl_metal.h>
#include <spdlog/spdlog.h>
#include <spdlog/fmt/fmt.h>
Expand Down
14 changes: 7 additions & 7 deletions src/graphic/Fast3D/gfx_opengl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
#endif

#ifdef _MSC_VER
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
// #define GL_GLEXT_PROTOTYPES 1
#include <GL/glew.h>
#elif FOR_WINDOWS
#include <GL/glew.h>
#include "SDL.h"
#include <SDL3/SDL.h>
#define GL_GLEXT_PROTOTYPES 1
#include "SDL_opengl.h"
#include <SDL3/SDL_opengl.h>
#elif __APPLE__
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <GL/glew.h>
#elif USE_OPENGLES
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <GLES3/gl3.h>
#else
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#define GL_GLEXT_PROTOTYPES 1
#include <SDL2/SDL_opengl.h>
#include <SDL3/SDL_opengl.h>
#endif

#include "gfx_cc.h"
Expand Down
12 changes: 6 additions & 6 deletions src/graphic/Fast3D/gfx_sdl2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@

#if FOR_WINDOWS
#include <GL/glew.h>
#include "SDL.h"
#include <SDL3/SDL.h>
#define GL_GLEXT_PROTOTYPES 1
#include "SDL_opengl.h"
#include <SDL3/SDL_opengl.h>
#elif __APPLE__
#include <SDL.h>
#include <SDL3/SDL.h>
#include "gfx_metal.h"
#else
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#define GL_GLEXT_PROTOTYPES 1
#include <SDL2/SDL_opengles2.h>
#include <SDL3/SDL_opengles2.h>
#endif

#include "window/gui/Gui.h"
Expand All @@ -33,7 +33,7 @@
#ifdef _WIN32
#include <WTypesbase.h>
#include <Windows.h>
#include <SDL_syswm.h>
#include <SDL3/SDL_syswm.h>
#endif

#define GFX_BACKEND_NAME "SDL"
Expand Down
2 changes: 1 addition & 1 deletion src/port/mobile/MobileImpl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if defined(__ANDROID__) || defined(__IOS__)
#include "MobileImpl.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include "public/bridge/consolevariablebridge.h"

#include <imgui_internal.h>
Expand Down
2 changes: 1 addition & 1 deletion src/public/libultra/os.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libultraship/libultraship.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include <ratio>

// Establish a chrono duration for the N64 46.875MHz clock rate
Expand Down
8 changes: 4 additions & 4 deletions src/window/gui/Gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
#include "window/gui/GfxDebuggerWindow.h"

#ifdef __APPLE__
#include <SDL_hints.h>
#include <SDL_video.h>
#include <SDL3/SDL_hints.h>
#include <SDL3/SDL_video.h>

#include "graphic/Fast3D/gfx_metal.h"
#include <imgui_impl_metal.h>
#include <imgui_impl_sdl2.h>
#else
#include <SDL2/SDL_hints.h>
#include <SDL2/SDL_video.h>
#include <SDL3/SDL_hints.h>
#include <SDL3/SDL_video.h>
#endif

#if defined(__ANDROID__) || defined(__IOS__)
Expand Down
2 changes: 1 addition & 1 deletion src/window/gui/Gui.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <map>
#include <unordered_map>
#include <vector>
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
#include "window/gui/ConsoleWindow.h"
#include "window/gui/InputEditorWindow.h"
#include "controller/deviceindex/ControllerDisconnectedWindow.h"
Expand Down

0 comments on commit 3c16024

Please sign in to comment.