mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Replace references to OS X

Browse source
This commit is contained in:
Marijn van der Werf 2016-06-13 19:49:06 +02:00
parent 7a7813693c
commit 42ee299f65
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OpenRCT2.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
D44271621CC81B3200D84D28 /* crash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crash.h; sourceTree = "<group>"; };
D44271631CC81B3200D84D28 /* linux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linux.c; sourceTree = "<group>"; };
D44271641CC81B3200D84D28 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = osx.m; sourceTree = "<group>"; };
D44271641CC81B3200D84D28 /* macos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macos.m; sourceTree = "<group>"; };
D44271651CC81B3200D84D28 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = "<group>"; };
D44271661CC81B3200D84D28 /* posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = posix.c; sourceTree = "<group>"; };
D44271671CC81B3200D84D28 /* shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shared.c; sourceTree = "<group>"; };
@ -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 */,

2
distribution/readme.txt
View file

@ -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.

4
scripts/linux/install.sh
View file

@ -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

2
src/network/http.cpp
View file

@ -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);

2
src/openrct2.c
View file

@ -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

0
src/platform/osx.m → src/platform/macos.m
View file

4
src/platform/shared.c
View file

@ -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 <CTRL>Backspace (Windows/Linux) or <MOD>Backspace (OS X)
// Clear the input on <CTRL>Backspace (Windows/Linux) or <MOD>Backspace (macOS)
if (e.key.keysym.sym == SDLK_BACKSPACE && (e.key.keysym.mod & KEYBOARD_PRIMARY_MODIFIER)) {
textinputbuffer_clear(&gTextInput);
console_refresh_caret();

2
src/rct2.h
View file

@ -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

2
src/version.h
View file

@ -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!