From 42ee299f65558d52bca9b2db558be39962f25442 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 13 Jun 2016 19:49:06 +0200 Subject: [PATCH] Replace references to OS X --- OpenRCT2.xcodeproj/project.pbxproj | 8 ++++---- distribution/readme.txt | 2 +- scripts/linux/install.sh | 4 ++-- src/network/http.cpp | 2 +- src/openrct2.c | 2 +- src/platform/{osx.m => macos.m} | 0 src/platform/shared.c | 4 ++-- src/rct2.h | 2 +- src/version.h | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/platform/{osx.m => macos.m} (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 6a0f0dad32..d2523fab17 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ D442723A1CC81B3200D84D28 /* staff.c in Sources */ = {isa = PBXBuildFile; fileRef = D442715E1CC81B3200D84D28 /* staff.c */; }; D442723B1CC81B3200D84D28 /* crash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D44271611CC81B3200D84D28 /* crash.cpp */; }; D442723C1CC81B3200D84D28 /* linux.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271631CC81B3200D84D28 /* linux.c */; }; - D442723D1CC81B3200D84D28 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = D44271641CC81B3200D84D28 /* osx.m */; }; + D442723D1CC81B3200D84D28 /* macos.m in Sources */ = {isa = PBXBuildFile; fileRef = D44271641CC81B3200D84D28 /* macos.m */; }; D442723E1CC81B3200D84D28 /* posix.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271661CC81B3200D84D28 /* posix.c */; }; D442723F1CC81B3200D84D28 /* shared.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271671CC81B3200D84D28 /* shared.c */; }; D44272401CC81B3200D84D28 /* windows.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271681CC81B3200D84D28 /* windows.c */; }; @@ -639,7 +639,7 @@ D44271611CC81B3200D84D28 /* crash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crash.cpp; sourceTree = ""; }; D44271621CC81B3200D84D28 /* crash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crash.h; sourceTree = ""; }; D44271631CC81B3200D84D28 /* linux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linux.c; sourceTree = ""; }; - D44271641CC81B3200D84D28 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = osx.m; sourceTree = ""; }; + D44271641CC81B3200D84D28 /* macos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macos.m; sourceTree = ""; }; D44271651CC81B3200D84D28 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = ""; }; D44271661CC81B3200D84D28 /* posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = posix.c; sourceTree = ""; }; D44271671CC81B3200D84D28 /* shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shared.c; sourceTree = ""; }; @@ -1469,7 +1469,7 @@ D44271611CC81B3200D84D28 /* crash.cpp */, D44271621CC81B3200D84D28 /* crash.h */, D44271631CC81B3200D84D28 /* linux.c */, - D44271641CC81B3200D84D28 /* osx.m */, + D44271641CC81B3200D84D28 /* macos.m */, D44271651CC81B3200D84D28 /* platform.h */, D44271661CC81B3200D84D28 /* posix.c */, D44271671CC81B3200D84D28 /* shared.c */, @@ -2326,7 +2326,7 @@ C6B5A7D51CDFE4CB00C9C006 /* S6Importer.cpp in Sources */, D44272221CC81B3200D84D28 /* widget.c in Sources */, D44271F71CC81B3200D84D28 /* mixer.cpp in Sources */, - D442723D1CC81B3200D84D28 /* osx.m in Sources */, + D442723D1CC81B3200D84D28 /* macos.m in Sources */, D44271FF1CC81B3200D84D28 /* Console.cpp in Sources */, D44272781CC81B3200D84D28 /* player.c in Sources */, C686F9161CDBC3B7009F9BFC /* lay_down_roller_coaster.c in Sources */, diff --git a/distribution/readme.txt b/distribution/readme.txt index 588c8d50a0..9551515e81 100644 --- a/distribution/readme.txt +++ b/distribution/readme.txt @@ -69,7 +69,7 @@ following information in your bug report: 3.0) Supported platforms ---- ------------------- OpenRCT2 is currently supported on Windows Vista and above, many distributions of -Linux and OSX 10.7. OpenRCT2 will only work on x86 architectures as the +Linux and macOS 10.7. OpenRCT2 will only work on x86 architectures as the original RollerCoaster Tycoon 2 binary is still required to run the game. Further instructions can be found on GitHub. diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh index 263d11e987..2855453ca4 100755 --- a/scripts/linux/install.sh +++ b/scripts/linux/install.sh @@ -114,7 +114,7 @@ function install_pkg_config { cat /usr/local/bin/i686-w64-mingw32-pkg-config } -function os_x_install_mingw_32 { +function mac_os_install_mingw_32 { local mingw_name="mingw-w32-bin_i686-darwin" local mingw_tar="${mingw_name}_20130531.tar.bz2" local mingw_path="/usr/local/$mingw_name" @@ -150,7 +150,7 @@ if [[ "$(uname)" == "Darwin" ]]; then if [[ $TARGET == "windows" ]]; then brew install wine - os_x_install_mingw_32 + mac_os_install_mingw_32 else brew install jansson sdl2 sdl2_ttf speex --universal fi diff --git a/src/network/http.cpp b/src/network/http.cpp index 0ebcbea449..524bba2811 100644 --- a/src/network/http.cpp +++ b/src/network/http.cpp @@ -151,7 +151,7 @@ http_json_response *http_request_json(const http_json_request *request) curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, true); #ifdef __WINDOWS__ - // On GNU/Linux (and OS X), curl will use the system certs by default + // On GNU/Linux (and macOS), curl will use the system certs by default curl_easy_setopt(curl, CURLOPT_CAINFO, _caBundlePath); #endif curl_easy_setopt(curl, CURLOPT_URL, request->url); diff --git a/src/openrct2.c b/src/openrct2.c index bf698d6732..58a2f7d6f0 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -482,7 +482,7 @@ void openrct2_reset_object_tween_locations() */ bool openrct2_setup_rct2_segment() { - // OpenRCT2 on Linux and OS X is wired to have the original Windows PE sections loaded + // OpenRCT2 on Linux and macOS is wired to have the original Windows PE sections loaded // necessary. Windows does not need to do this as OpenRCT2 runs as a DLL loaded from the Windows PE. #if defined(__unix__) #define RDATA_OFFSET 0x004A4000 diff --git a/src/platform/osx.m b/src/platform/macos.m similarity index 100% rename from src/platform/osx.m rename to src/platform/macos.m diff --git a/src/platform/shared.c b/src/platform/shared.c index 076f9d1aff..8bd1d58a99 100644 --- a/src/platform/shared.c +++ b/src/platform/shared.c @@ -380,7 +380,7 @@ void platform_process_messages() break; } break; -// Apple sends touchscreen events for trackpads, so ignore these events on OS X +// Apple sends touchscreen events for trackpads, so ignore these events on macOS #ifndef __MACOSX__ case SDL_FINGERMOTION: RCT2_GLOBAL(0x0142406C, int) = (int)(e.tfinger.x * gScreenWidth); @@ -438,7 +438,7 @@ void platform_process_messages() // Text input if (gTextInput.buffer == NULL) break; - // Clear the input on Backspace (Windows/Linux) or Backspace (OS X) + // Clear the input on Backspace (Windows/Linux) or Backspace (macOS) if (e.key.keysym.sym == SDLK_BACKSPACE && (e.key.keysym.mod & KEYBOARD_PRIMARY_MODIFIER)) { textinputbuffer_clear(&gTextInput); console_refresh_caret(); diff --git a/src/rct2.h b/src/rct2.h index 9d75f717fe..923ab22f65 100644 --- a/src/rct2.h +++ b/src/rct2.h @@ -135,7 +135,7 @@ typedef uint8 colour_t; char *strndup(const char *src, size_t size); #endif // !(POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700) -// BSD and OS X has MAP_ANON instead of MAP_ANONYMOUS +// BSD and macOS have MAP_ANON instead of MAP_ANONYMOUS #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/src/version.h b/src/version.h index 475b6573a0..ca7239cea8 100644 --- a/src/version.h +++ b/src/version.h @@ -31,7 +31,7 @@ #define OPENRCT2_PLATFORM "Linux" #endif #ifdef __MACOSX__ - #define OPENRCT2_PLATFORM "OS X" + #define OPENRCT2_PLATFORM "macOS" #endif #ifndef OPENRCT2_PLATFORM #error Unknown platform!