run rename_macros.py

briaguya-ai · Jan 11, 2025 · 4085f27 · 4085f27
1 parent 3c16024
commit 4085f27
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 50 deletions.
diff --git a/include/libultraship/classes.h b/include/libultraship/classes.h
@@ -35,7 +35,7 @@
 #include "audio/WasapiAudioPlayer.h"
 #endif
 #include "audio/SDLAudioPlayer.h"
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 #include "utils/AppleFolderManager.h"
 #endif
 #endif

diff --git a/src/Context.cpp b/src/Context.cpp
@@ -11,7 +11,7 @@
 #include <tchar.h>
 #endif
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 #include "utils/AppleFolderManager.h"
 #include <unistd.h>
 #include <pwd.h>
@@ -389,7 +389,7 @@ std::string Context::GetAppBundlePath() {
 #ifdef NON_PORTABLE
     return CMAKE_INSTALL_PREFIX;
 #else
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
     FolderManager folderManager;
     return folderManager.getMainBundlePath();
 #endif
@@ -427,7 +427,7 @@ std::string Context::GetAppDirectoryPath(std::string appName) {
     return std::string(home) + "/Documents";
 #endif
 
-#if defined(__APPLE__)
+#if defined(SDL_PLATFORM_APPLE)
     if (char* fpath = std::getenv("SHIP_HOME")) {
         if (fpath[0] == '~') {
             const char* home = getenv("HOME") ? getenv("HOME") : getpwuid(getuid())->pw_dir;

diff --git a/src/config/Config.cpp b/src/config/Config.cpp
@@ -8,7 +8,7 @@
 #include "utils/StringHelper.h"
 #include "Context.h"
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 #include "graphic/Fast3D/gfx_metal.h"
 #endif
 
@@ -252,7 +252,7 @@ WindowBackend Config::GetWindowBackend() {
 #ifdef ENABLE_DX11
     return WindowBackend::FAST3D_DXGI_DX11;
 #endif
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
     if (Metal_IsSupported()) {
         return WindowBackend::FAST3D_SDL_METAL;
     }

diff --git a/src/controller/controldevice/controller/Controller.cpp b/src/controller/controldevice/controller/Controller.cpp
@@ -2,7 +2,7 @@
 #include <memory>
 #include <algorithm>
 #include "public/bridge/consolevariablebridge.h"
-#if __APPLE__
+#if SDL_PLATFORM_APPLE
 #include <SDL3/SDL_events.h>
 #else
 #include <SDL3/SDL_events.h>

diff --git a/src/graphic/Fast3D/Fast3dWindow.cpp b/src/graphic/Fast3D/Fast3dWindow.cpp
@@ -24,7 +24,7 @@ Fast3dWindow::Fast3dWindow(std::vector<std::shared_ptr<Ship::GuiWindow>> guiWind
 #ifdef _WIN32
     AddAvailableWindowBackend(Ship::WindowBackend::FAST3D_DXGI_DX11);
 #endif
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
     if (Metal_IsSupported()) {
         AddAvailableWindowBackend(Ship::WindowBackend::FAST3D_SDL_METAL);
     }
@@ -119,7 +119,7 @@ void Fast3dWindow::InitWindowManager() {
             mWindowManagerApi = &gfx_sdl;
             break;
 #endif
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
         case Ship::WindowBackend::FAST3D_SDL_METAL:
             mRenderingApi = &gfx_metal_api;
             mWindowManagerApi = &gfx_sdl;

diff --git a/src/graphic/Fast3D/gfx_metal.cpp b/src/graphic/Fast3D/gfx_metal.cpp
@@ -5,7 +5,7 @@
 //  Created by David Chavez on 16.08.22.
 //
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 
 #include "gfx_metal.h"
 

diff --git a/src/graphic/Fast3D/gfx_metal.h b/src/graphic/Fast3D/gfx_metal.h
@@ -5,7 +5,7 @@
 //  Created by David Chavez on 16.08.22.
 //
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 
 #ifndef GFX_METAL_H
 #define GFX_METAL_H

diff --git a/src/graphic/Fast3D/gfx_metal_shader.cpp b/src/graphic/Fast3D/gfx_metal_shader.cpp
@@ -5,7 +5,7 @@
 //  Created by David Chavez on 16.08.22.
 //
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 
 #include <Metal/Metal.hpp>
 #include <public/bridge/consolevariablebridge.h>

diff --git a/src/graphic/Fast3D/gfx_metal_shader.h b/src/graphic/Fast3D/gfx_metal_shader.h
@@ -5,7 +5,7 @@
 //  Created by David Chavez on 16.08.22.
 //
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 
 #ifndef GFX_METAL_SHADER_H
 #define GFX_METAL_SHADER_H

diff --git a/src/graphic/Fast3D/gfx_opengl.cpp b/src/graphic/Fast3D/gfx_opengl.cpp
@@ -27,7 +27,7 @@
 #include <SDL3/SDL.h>
 #define GL_GLEXT_PROTOTYPES 1
 #include <SDL3/SDL_opengl.h>
-#elif __APPLE__
+#elif SDL_PLATFORM_APPLE
 #include <SDL3/SDL.h>
 #include <GL/glew.h>
 #elif USE_OPENGLES
@@ -70,7 +70,7 @@ struct Framebuffer {
 
 static map<pair<uint64_t, uint32_t>, struct ShaderProgram> shader_program_pool;
 static GLuint opengl_vbo;
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
 static GLuint opengl_vao;
 #endif
 
@@ -279,7 +279,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     size_t num_floats = 4;
 
     // Vertex shader
-#if defined(__APPLE__)
+#if defined(SDL_PLATFORM_APPLE)
     append_line(vs_buf, &vs_len, "#version 410 core");
     append_line(vs_buf, &vs_len, "in vec4 aVtxPos;");
 #elif defined(USE_OPENGLES)
@@ -291,7 +291,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
 #endif
     for (int i = 0; i < 2; i++) {
         if (cc_features.used_textures[i]) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
             vs_len += sprintf(vs_buf + vs_len, "in vec2 aTexCoord%d;\n", i);
             vs_len += sprintf(vs_buf + vs_len, "out vec2 vTexCoord%d;\n", i);
 #else
@@ -301,7 +301,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
             num_floats += 2;
             for (int j = 0; j < 2; j++) {
                 if (cc_features.clamp[i][j]) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
                     vs_len += sprintf(vs_buf + vs_len, "in float aTexClamp%s%d;\n", j == 0 ? "S" : "T", i);
                     vs_len += sprintf(vs_buf + vs_len, "out float vTexClamp%s%d;\n", j == 0 ? "S" : "T", i);
 #else
@@ -314,7 +314,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         }
     }
     if (cc_features.opt_fog) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(vs_buf, &vs_len, "in vec4 aFog;");
         append_line(vs_buf, &vs_len, "out vec4 vFog;");
 #else
@@ -325,7 +325,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     }
 
     if (cc_features.opt_grayscale) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(vs_buf, &vs_len, "in vec4 aGrayscaleColor;");
         append_line(vs_buf, &vs_len, "out vec4 vGrayscaleColor;");
 #else
@@ -336,7 +336,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     }
 
     for (int i = 0; i < cc_features.num_inputs; i++) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         vs_len += sprintf(vs_buf + vs_len, "in vec%d aInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
         vs_len += sprintf(vs_buf + vs_len, "out vec%d vInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
 #else
@@ -373,7 +373,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     append_line(vs_buf, &vs_len, "}");
 
     // Fragment shader
-#if defined(__APPLE__)
+#if defined(SDL_PLATFORM_APPLE)
     append_line(fs_buf, &fs_len, "#version 410 core");
 #elif defined(USE_OPENGLES)
     append_line(fs_buf, &fs_len, "#version 300 es");
@@ -383,14 +383,14 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
 #endif
     for (int i = 0; i < 2; i++) {
         if (cc_features.used_textures[i]) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
             fs_len += sprintf(fs_buf + fs_len, "in vec2 vTexCoord%d;\n", i);
 #else
             fs_len += sprintf(fs_buf + fs_len, "varying vec2 vTexCoord%d;\n", i);
 #endif
             for (int j = 0; j < 2; j++) {
                 if (cc_features.clamp[i][j]) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
                     fs_len += sprintf(fs_buf + fs_len, "in float vTexClamp%s%d;\n", j == 0 ? "S" : "T", i);
 #else
                     fs_len += sprintf(fs_buf + fs_len, "varying float vTexClamp%s%d;\n", j == 0 ? "S" : "T", i);
@@ -400,21 +400,21 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         }
     }
     if (cc_features.opt_fog) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "in vec4 vFog;");
 #else
         append_line(fs_buf, &fs_len, "varying vec4 vFog;");
 #endif
     }
     if (cc_features.opt_grayscale) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "in vec4 vGrayscaleColor;");
 #else
         append_line(fs_buf, &fs_len, "varying vec4 vGrayscaleColor;");
 #endif
     }
     for (int i = 0; i < cc_features.num_inputs; i++) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         fs_len += sprintf(fs_buf + fs_len, "in vec%d vInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
 #else
         fs_len += sprintf(fs_buf + fs_len, "varying vec%d vInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
@@ -448,7 +448,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     append_line(fs_buf, &fs_len, "}");
 
     if (current_filter_mode == FILTER_THREE_POINT) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "#define TEX_OFFSET(off) texture(tex, texCoord - (off)/texSize)");
 #else
         append_line(fs_buf, &fs_len, "#define TEX_OFFSET(off) texture2D(tex, texCoord - (off)/texSize)");
@@ -466,15 +466,15 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         append_line(fs_buf, &fs_len, "}");
     } else {
         append_line(fs_buf, &fs_len, "vec4 hookTexture2D(in sampler2D tex, in vec2 uv, in vec2 texSize) {");
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "    return texture(tex, uv);");
 #else
         append_line(fs_buf, &fs_len, "    return texture2D(tex, uv);");
 #endif
         append_line(fs_buf, &fs_len, "}");
     }
 
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
     append_line(fs_buf, &fs_len, "out vec4 outColor;");
 #endif
 
@@ -616,21 +616,21 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         if (cc_features.opt_invisible) {
             append_line(fs_buf, &fs_len, "texel.a = 0.0;");
         }
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "outColor = texel;");
 #else
         append_line(fs_buf, &fs_len, "gl_FragColor = texel;");
 #endif
     } else {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "outColor = vec4(texel, 1.0);");
 #else
         append_line(fs_buf, &fs_len, "gl_FragColor = vec4(texel, 1.0);");
 #endif
     }
 
     if (srgb_mode) {
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
         append_line(fs_buf, &fs_len, "outColor = fromLinear(outColor);");
 #else
         append_line(fs_buf, &fs_len, "gl_FragColor = fromLinear(gl_FragColor);");
@@ -920,7 +920,7 @@ static void gfx_opengl_init() {
     glGenBuffers(1, &opengl_vbo);
     glBindBuffer(GL_ARRAY_BUFFER, opengl_vbo);
 
-#if defined(__APPLE__) || defined(USE_OPENGLES)
+#if defined(SDL_PLATFORM_APPLE) || defined(USE_OPENGLES)
     glGenVertexArrays(1, &opengl_vao);
     glBindVertexArray(opengl_vao);
 #endif

diff --git a/src/graphic/Fast3D/gfx_pc.cpp b/src/graphic/Fast3D/gfx_pc.cpp
@@ -4076,7 +4076,7 @@ void gfx_init(struct GfxWindowManagerAPI* wapi, struct GfxRenderingAPI* rapi, co
     gfx_wapi->init(game_name, rapi->get_name(), start_in_fullscreen, width, height, posX, posY);
     gfx_rapi->init();
     gfx_rapi->update_framebuffer_parameters(0, width, height, 1, false, true, true, true);
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
     gfx_current_dimensions.internal_mul = 1;
 #else
     gfx_current_dimensions.internal_mul = CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1);

diff --git a/src/graphic/Fast3D/gfx_sdl2.cpp b/src/graphic/Fast3D/gfx_sdl2.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#if defined(ENABLE_OPENGL) || defined(__APPLE__)
+#if defined(ENABLE_OPENGL) || defined(SDL_PLATFORM_APPLE)
 
 #ifdef __MINGW32__
 #define FOR_WINDOWS 1
@@ -16,7 +16,7 @@
 #include <SDL3/SDL.h>
 #define GL_GLEXT_PROTOTYPES 1
 #include <SDL3/SDL_opengl.h>
-#elif __APPLE__
+#elif SDL_PLATFORM_APPLE
 #include <SDL3/SDL.h>
 #include "gfx_metal.h"
 #else
@@ -323,7 +323,7 @@ static void gfx_sdl_init(const char* game_name, const char* gfx_api_name, bool s
 
     SDL_EventState(SDL_EVENT_DROP_FILE, SDL_ENABLE);
 
-#if defined(__APPLE__)
+#if defined(SDL_PLATFORM_APPLE)
     bool use_opengl = strcmp(gfx_api_name, "OpenGL") == 0;
 #else
     bool use_opengl = true;
@@ -337,7 +337,7 @@ static void gfx_sdl_init(const char* game_name, const char* gfx_api_name, bool s
         SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
     }
 
-#if defined(__APPLE__)
+#if defined(SDL_PLATFORM_APPLE)
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG); // Always required on Mac
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);

diff --git a/src/window/Window.cpp b/src/window/Window.cpp
@@ -6,7 +6,7 @@
 #include "controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h"
 #include "Context.h"
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
 #include "utils/AppleFolderManager.h"
 #endif