mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-29 02:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Apple's nomenclature for macOS and iOS

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/6621
This commit is contained in:
Sam Lantinga
2022-11-25 16:00:06 -08:00
parent 5fb3eb9475
commit cc1f9eb983
83 changed files with 291 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/checkkeys.c
View File

@@ -275,7 +275,7 @@ main(int argc, char *argv[])
textwin = SDLTest_TextWindowCreate(0, 0, 640, 480);
#if __IPHONEOS__
#if __IOS__
/* Creating the context creates the view, which we need to show keyboard */
SDL_GL_CreateContext(window);
#endif

2
test/checkkeysthreads.c
View File

@@ -254,7 +254,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, -1, 0);
SDL_RenderPresent(renderer);
#if __IPHONEOS__
#if __IOS__
/* Creating the context creates the view, which we need to show keyboard */
SDL_GL_CreateContext(window);
#endif

2
test/testautomation_surface.c
View File

@@ -16,7 +16,7 @@
#include "SDL.h"
#include "SDL_test.h"
#ifdef __MACOSX__
#ifdef __MACOS__
#include <unistd.h> /* For unlink() */
#endif

2
test/testdropfile.c
View File

@@ -44,7 +44,7 @@ main(int argc, char *argv[])
int consumed;
consumed = SDLTest_CommonArg(state, i);
/* needed voodoo to allow app to launch via OS X Finder */
/* needed voodoo to allow app to launch via macOS Finder */
if (SDL_strncmp(argv[i], "-psn", 4)==0) {
consumed = 1;
}

2
test/testfile.c
View File

@@ -28,7 +28,7 @@
/* WARNING ! those 2 files will be destroyed by this test program */
#ifdef __IPHONEOS__
#ifdef __IOS__
#define FBASENAME1 "../Documents/sdldata1" /* this file will be created during tests */
#define FBASENAME2 "../Documents/sdldata2" /* this file should not exist before starting test */
#else

2
test/testgles.c
View File

@@ -16,7 +16,7 @@
#include "SDL_test_common.h"
#if defined(__IPHONEOS__) || defined(__ANDROID__)
#if defined(__IOS__) || defined(__ANDROID__)
#define HAVE_OPENGLES
#endif

2
test/testgles2.c
View File

@@ -20,7 +20,7 @@
#include "SDL_test_common.h"
#if defined(__IPHONEOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
#if defined(__IOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
#ifndef HAVE_OPENGLES2
#define HAVE_OPENGLES2
#endif

2
test/testgles2_sdf.c
View File

@@ -20,7 +20,7 @@
#include "SDL_test_common.h"
#if defined(__IPHONEOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
#if defined(__IOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
#define HAVE_OPENGLES2
#endif

2
test/testime.c
View File

@@ -27,7 +27,7 @@
#define DEFAULT_PTSIZE 30
#ifdef HAVE_SDL_TTF
#ifdef __MACOSX__
#ifdef __MACOS__
#define DEFAULT_FONT "/System/Library/Fonts/华文细黑.ttf"
#elif __WIN32__
/* Some japanese font present on at least Windows 8.1. */

2
test/testjoystick.c
View File

@@ -24,7 +24,7 @@
#ifndef SDL_JOYSTICK_DISABLED
#ifdef __IPHONEOS__
#ifdef __IOS__
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 480
#else

2
test/testmessage.c
View File

@@ -158,7 +158,7 @@ main(int argc, char *argv[])
/* Test showing a message box from a background thread.
On Mac OS X, the video subsystem needs to be initialized for this
On macOS, the video subsystem needs to be initialized for this
to work, since the message box events are dispatched by the Cocoa
subsystem on the main thread.
*/

2
test/testmouse.c
View File

@@ -18,7 +18,7 @@
#include <stdlib.h> /* exit() */
#ifdef __IPHONEOS__
#ifdef __IOS__
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 480
#else