From e985632fae86dad1fbe363c54169a3d2c70d6d71 Mon Sep 17 00:00:00 2001 From: def Date: Fri, 12 Feb 2021 13:40:29 +0100 Subject: [PATCH] OSX -> macOS Changing the filenames of the releases will be a bit more annoying, so not sure we want to do that --- CMakeLists.txt | 6 +++--- src/base/detect.h | 4 ++-- src/base/system.c | 12 ++++++------ src/base/system.h | 4 ++-- src/engine/client/backend_sdl.cpp | 6 +++--- src/engine/client/backend_sdl.h | 2 +- src/engine/client/client.cpp | 2 +- src/engine/client/input.cpp | 2 +- src/engine/client/notifications.cpp | 4 ++-- src/engine/client/video.cpp | 4 ++-- src/engine/client/video.h | 2 +- src/engine/shared/config_variables.h | 4 ++-- src/engine/shared/storage.cpp | 2 +- src/{osx => macos}/notifications.mm | 0 src/{osxlaunch => macoslaunch}/client.m | 0 src/{osxlaunch => macoslaunch}/server.mm | 0 src/{osxlaunch => macoslaunch}/server_mysql.m | 0 storage.cfg | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) rename src/{osx => macos}/notifications.mm (100%) rename src/{osxlaunch => macoslaunch}/client.m (100%) rename src/{osxlaunch => macoslaunch}/server.mm (100%) rename src/{osxlaunch => macoslaunch}/server_mysql.m (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d0dbaf25d9..1e2bbc982e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -535,8 +535,8 @@ elseif(TARGET_OS STREQUAL "mac") find_library(OPENGL OpenGL) find_library(SECURITY Security) set(PLATFORM_CLIENT - src/osx/notifications.mm - src/osxlaunch/client.m + src/macos/notifications.mm + src/macoslaunch/client.m ) set(PLATFORM_CLIENT_LIBS ${COCOA} ${OPENGL}) set(PLATFORM_LIBS ${CARBON} ${SECURITY}) @@ -2073,7 +2073,7 @@ list(APPEND TARGETS_OWN ${TARGET_SERVER}) list(APPEND TARGETS_LINK ${TARGET_SERVER}) if(TARGET_OS AND TARGET_OS STREQUAL "mac") - set(SERVER_LAUNCHER_SRC src/osxlaunch/server.mm) + set(SERVER_LAUNCHER_SRC src/macoslaunch/server.mm) set(TARGET_SERVER_LAUNCHER ${TARGET_SERVER}-Launcher) add_executable(${TARGET_SERVER_LAUNCHER} ${SERVER_LAUNCHER_SRC}) target_link_libraries(${TARGET_SERVER_LAUNCHER} ${COCOA}) diff --git a/src/base/detect.h b/src/base/detect.h index 9d32094cae3..914c4760b0d 100644 --- a/src/base/detect.h +++ b/src/base/detect.h @@ -63,8 +63,8 @@ #if defined(MACOSX) || defined(__APPLE__) || defined(__DARWIN__) #define CONF_FAMILY_UNIX 1 #define CONF_FAMILY_STRING "unix" -#define CONF_PLATFORM_MACOSX 1 -#define PLATFORM_STRING "macosx" +#define CONF_PLATFORM_MACOS 1 +#define PLATFORM_STRING "macos" #endif #if defined(__sun) diff --git a/src/base/system.c b/src/base/system.c index bde23138907..cb4591d3edc 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -35,7 +35,7 @@ #include -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) // some lock and pthread functions are already defined in headers // included from Carbon.h // this prevents having duplicate definitions of those @@ -882,7 +882,7 @@ void sphore_init(SEMAPHORE *sem) void sphore_wait(SEMAPHORE *sem) { WaitForSingleObject((HANDLE)*sem, INFINITE); } void sphore_signal(SEMAPHORE *sem) { ReleaseSemaphore((HANDLE)*sem, 1, NULL); } void sphore_destroy(SEMAPHORE *sem) { CloseHandle((HANDLE)*sem); } -#elif defined(CONF_PLATFORM_MACOSX) +#elif defined(CONF_PLATFORM_MACOS) void sphore_init(SEMAPHORE *sem) { char aBuf[64]; @@ -935,7 +935,7 @@ int64 time_get_impl(void) { static int64 last = 0; { -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) static int got_timebase = 0; mach_timebase_info_data_t timebase; uint64 time; @@ -986,7 +986,7 @@ int64 time_get(void) int64 time_freq(void) { -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) return 1000000000; #elif defined(CONF_FAMILY_UNIX) return 1000000; @@ -2061,13 +2061,13 @@ int fs_storage_path(const char *appname, char *path, int max) return 0; #else char *home = getenv("HOME"); -#if !defined(CONF_PLATFORM_MACOSX) +#if !defined(CONF_PLATFORM_MACOS) int i; #endif if(!home) return -1; -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) snprintf(path, max, "%s/Library/Application Support/%s", home, appname); #else snprintf(path, max, "%s/.%s", home, appname); diff --git a/src/base/system.h b/src/base/system.h index 69fe08b2884..6b136383289 100644 --- a/src/base/system.h +++ b/src/base/system.h @@ -611,7 +611,7 @@ void lock_unlock(LOCK lock) RELEASE(lock); /* Group: Semaphores */ #if defined(CONF_FAMILY_WINDOWS) typedef void *SEMAPHORE; -#elif defined(CONF_PLATFORM_MACOSX) +#elif defined(CONF_PLATFORM_MACOS) #include typedef sem_t *SEMAPHORE; #elif defined(CONF_FAMILY_UNIX) @@ -1655,7 +1655,7 @@ int fs_makedir_rec_for(const char *path); Remarks: - Returns ~/.appname on UNIX based systems - - Returns ~/Library/Applications Support/appname on Mac OS X + - Returns ~/Library/Applications Support/appname on macOS - Returns %APPDATA%/Appname on Windows based systems */ int fs_storage_path(const char *appname, char *path, int max); diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp index cfe85156e48..855366a41e5 100644 --- a/src/engine/client/backend_sdl.cpp +++ b/src/engine/client/backend_sdl.cpp @@ -74,7 +74,7 @@ void CGraphicsBackend_Threaded::ThreadFunc(void *pUser) pThis->m_Activity.Wait(); if(pThis->m_pBuffer) { -#ifdef CONF_PLATFORM_MACOSX +#ifdef CONF_PLATFORM_MACOS CAutoreleasePool AutoreleasePool; #endif pThis->m_pProcessor->RunBuffer(pThis->m_pBuffer); @@ -4757,7 +4757,7 @@ void CGraphicsBackend_SDL_OpenGL::Maximize() bool CGraphicsBackend_SDL_OpenGL::Fullscreen(bool State) { -#if defined(CONF_PLATFORM_MACOSX) // Todo SDL: remove this when fixed (game freezes when losing focus in fullscreen) +#if defined(CONF_PLATFORM_MACOS) // Todo SDL: remove this when fixed (game freezes when losing focus in fullscreen) return SDL_SetWindowFullscreen(m_pWindow, State ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0) == 0; #else return SDL_SetWindowFullscreen(m_pWindow, State ? SDL_WINDOW_FULLSCREEN : 0) == 0; @@ -4836,7 +4836,7 @@ void CGraphicsBackend_SDL_OpenGL::NotifyWindow() desc.dwTimeout = 0; FlashWindowEx(&desc); -#elif defined(SDL_VIDEO_DRIVER_X11) && !defined(CONF_PLATFORM_MACOSX) +#elif defined(SDL_VIDEO_DRIVER_X11) && !defined(CONF_PLATFORM_MACOS) Display *dpy = info.info.x11.display; Window win = info.info.x11.window; diff --git a/src/engine/client/backend_sdl.h b/src/engine/client/backend_sdl.h index acb5fdcb92e..a4231018a05 100644 --- a/src/engine/client/backend_sdl.h +++ b/src/engine/client/backend_sdl.h @@ -11,7 +11,7 @@ #include -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) #include class CAutoreleasePool diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 3be34bbef54..fd6958773c5 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -4255,7 +4255,7 @@ void CClient::HandleMapPath(const char *pPath) Upstream latency */ -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) extern "C" int TWMain(int argc, const char **argv) // ignore_convention #else int main(int argc, const char **argv) // ignore_convention diff --git a/src/engine/client/input.cpp b/src/engine/client/input.cpp index fd2338f0b9c..c369c289081 100644 --- a/src/engine/client/input.cpp +++ b/src/engine/client/input.cpp @@ -347,7 +347,7 @@ int CInput::Update() m_InputGrabbed = true; } break; -#if defined(CONF_PLATFORM_MACOSX) // Todo: remove this when fixed in SDL +#if defined(CONF_PLATFORM_MACOS) // Todo: remove this when fixed in SDL case SDL_WINDOWEVENT_MAXIMIZED: MouseModeAbsolute(); MouseModeRelative(); diff --git a/src/engine/client/notifications.cpp b/src/engine/client/notifications.cpp index 4a4a8c245a3..cf29e79fb1d 100644 --- a/src/engine/client/notifications.cpp +++ b/src/engine/client/notifications.cpp @@ -2,8 +2,8 @@ #include -#if defined(CONF_PLATFORM_MACOSX) -// Code is in src/osx/notification.mm. +#if defined(CONF_PLATFORM_MACOS) +// Code is in src/macos/notification.mm. #elif defined(CONF_FAMILY_UNIX) #include void NotificationsInit() diff --git a/src/engine/client/video.cpp b/src/engine/client/video.cpp index 9ac9c3639bd..00f74e0ebf5 100644 --- a/src/engine/client/video.cpp +++ b/src/engine/client/video.cpp @@ -215,7 +215,7 @@ void CVideo::NextVideoFrameThread() { if(m_NextFrame && m_Recording) { - // #ifdef CONF_PLATFORM_MACOSX + // #ifdef CONF_PLATFORM_MACOS // CAutoreleasePool AutoreleasePool; // #endif m_Vseq += 1; @@ -243,7 +243,7 @@ void CVideo::NextVideoFrame() { if(m_Recording) { - // #ifdef CONF_PLATFORM_MACOSX + // #ifdef CONF_PLATFORM_MACOS // CAutoreleasePool AutoreleasePool; // #endif diff --git a/src/engine/client/video.h b/src/engine/client/video.h index 1422e5c60a9..6d8c64c1180 100644 --- a/src/engine/client/video.h +++ b/src/engine/client/video.h @@ -10,7 +10,7 @@ #else #include "SDL_opengl.h" -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) #include "OpenGL/glu.h" #else #include "GL/glu.h" diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index a806f508624..3f5eec3ee7c 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -98,7 +98,7 @@ MACRO_CONFIG_INT(SndHighlight, snd_highlight, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CL MACRO_CONFIG_INT(GfxScreen, gfx_screen, 0, 0, 15, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen index") MACRO_CONFIG_INT(GfxScreenWidth, gfx_screen_width, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen resolution width") MACRO_CONFIG_INT(GfxScreenHeight, gfx_screen_height, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Screen resolution height") -#if !defined(CONF_PLATFORM_MACOSX) +#if !defined(CONF_PLATFORM_MACOS) MACRO_CONFIG_INT(GfxBorderless, gfx_borderless, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Borderless window (not to be used with fullscreen)") MACRO_CONFIG_INT(GfxFullscreen, gfx_fullscreen, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Fullscreen") #else @@ -395,7 +395,7 @@ MACRO_CONFIG_INT(GfxOpenGLTextureLODBIAS, gfx_opengl_texture_lod_bias, -500, -15 MACRO_CONFIG_INT(Gfx3DTextureAnalysisDone, gfx_3d_texture_analysis_done, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Analyzed, if sampling 3D/2D array textures was correct") MACRO_CONFIG_INT(GfxDriverIsBlocked, gfx_driver_is_blocked, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "If 1, the current driver is in a blocked error state.") -#if !defined(CONF_PLATFORM_MACOSX) +#if !defined(CONF_PLATFORM_MACOS) MACRO_CONFIG_INT(GfxEnableTextureUnitOptimization, gfx_enable_texture_unit_optimization, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Use multiple texture units, instead of only one.") #else MACRO_CONFIG_INT(GfxEnableTextureUnitOptimization, gfx_enable_texture_unit_optimization, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Use multiple texture units, instead of only one.") diff --git a/src/engine/shared/storage.cpp b/src/engine/shared/storage.cpp index 3f2ca2486cf..332a8d643ae 100644 --- a/src/engine/shared/storage.cpp +++ b/src/engine/shared/storage.cpp @@ -269,7 +269,7 @@ class CStorage : public IStorage } else { -#if defined(CONF_PLATFORM_MACOSX) +#if defined(CONF_PLATFORM_MACOS) str_append(m_aBinarydir, "/../../../DDNet-Server.app/Contents/MacOS", sizeof(m_aBinarydir)); str_format(aBuf, sizeof(aBuf), "%s/" PLAT_SERVER_EXEC, m_aBinarydir); IOHANDLE File = io_open(aBuf, IOFLAG_READ); diff --git a/src/osx/notifications.mm b/src/macos/notifications.mm similarity index 100% rename from src/osx/notifications.mm rename to src/macos/notifications.mm diff --git a/src/osxlaunch/client.m b/src/macoslaunch/client.m similarity index 100% rename from src/osxlaunch/client.m rename to src/macoslaunch/client.m diff --git a/src/osxlaunch/server.mm b/src/macoslaunch/server.mm similarity index 100% rename from src/osxlaunch/server.mm rename to src/macoslaunch/server.mm diff --git a/src/osxlaunch/server_mysql.m b/src/macoslaunch/server_mysql.m similarity index 100% rename from src/osxlaunch/server_mysql.m rename to src/macoslaunch/server_mysql.m diff --git a/storage.cfg b/storage.cfg index 15f4ab18d6c..1a28d87e2a6 100644 --- a/storage.cfg +++ b/storage.cfg @@ -7,7 +7,7 @@ # There are 3 special paths available: # $USERDIR # - ~/.appname on UNIX based systems -# - ~/Library/Applications Support/appname on Mac OS X +# - ~/Library/Applications Support/appname on macOS # - %APPDATA%/Appname on Windows based systems # $DATADIR # - the 'data' directory which is part of an official