admin/SDL
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wundef warnings due to use of unguarded SDL_VIDEO_DRIVER_COCOA

Browse Source
This commit is contained in:
Anonymous Maarten committed 2023-03-28 19:29:42 +02:00
1 parent 995c345a62
commit f14fe3f9aa
19 files changed
+29 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/video/SDL_egl.c
+1 -1
View File
@@ -82,7 +82,7 @@
#define DEFAULT_OGL_ES_PVR "libGLES_CM.dll"
#define DEFAULT_OGL_ES "libGLESv1_CM.dll"
#elif SDL_VIDEO_DRIVER_COCOA
#elif defined(SDL_VIDEO_DRIVER_COCOA)
/* EGL AND OpenGL ES support via ANGLE */
#define DEFAULT_EGL "libEGL.dylib"
#define DEFAULT_OGL_ES2 "libGLESv2.dylib"
src/video/SDL_video.c
+4 -4
View File
@@ -64,7 +64,7 @@
/* Available video drivers */
static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
&COCOA_bootstrap,
#endif
#if SDL_VIDEO_DRIVER_WAYLAND
@@ -4659,7 +4659,7 @@ int SDL_GetMessageBoxCount(void)
#if SDL_VIDEO_DRIVER_WINRT
#include "winrt/SDL_winrtmessagebox.h"
#endif
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#include "cocoa/SDL_cocoamessagebox.h"
#endif
#if SDL_VIDEO_DRIVER_UIKIT
@@ -4681,7 +4681,7 @@ int SDL_GetMessageBoxCount(void)
#include "vita/SDL_vitamessagebox.h"
#endif
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || SDL_VIDEO_DRIVER_WINRT || SDL_VIDEO_DRIVER_COCOA || SDL_VIDEO_DRIVER_UIKIT || SDL_VIDEO_DRIVER_X11 || SDL_VIDEO_DRIVER_WAYLAND || SDL_VIDEO_DRIVER_HAIKU || SDL_VIDEO_DRIVER_RISCOS
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || SDL_VIDEO_DRIVER_WINRT || defined(SDL_VIDEO_DRIVER_COCOA) || SDL_VIDEO_DRIVER_UIKIT || SDL_VIDEO_DRIVER_X11 || SDL_VIDEO_DRIVER_WAYLAND || SDL_VIDEO_DRIVER_HAIKU || SDL_VIDEO_DRIVER_RISCOS
static SDL_bool SDL_IsMessageboxValidForDriver(const SDL_MessageBoxData *messageboxdata, SDL_SYSWM_TYPE drivertype)
{
SDL_SysWMinfo info;
@@ -4760,7 +4760,7 @@ int SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
if (retval == -1 &&
SDL_IsMessageboxValidForDriver(messageboxdata, SDL_SYSWM_COCOA) &&
Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0) {
src/video/SDL_vulkan_internal.h
+1 -1
View File
@@ -31,7 +31,7 @@
#ifdef SDL_VIDEO_DRIVER_ANDROID
#define VK_USE_PLATFORM_ANDROID_KHR
#endif
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#define VK_USE_PLATFORM_METAL_EXT
#define VK_USE_PLATFORM_MACOS_MVK
#endif
src/video/cocoa/SDL_cocoaclipboard.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#include "SDL_cocoavideo.h"
#include "../../events/SDL_clipboardevents_c.h"
src/video/cocoa/SDL_cocoaevents.m
+7 -7
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#include "SDL_cocoavideo.h"
#include "../../events/SDL_events_c.h"
@@ -129,9 +129,9 @@ static void Cocoa_DispatchEvent(NSEvent *theEvent)
- (id)init;
- (void)localeDidChange:(NSNotification *)notification;
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
context:(void *)context;
@end
@@ -277,9 +277,9 @@ static void Cocoa_DispatchEvent(NSEvent *theEvent)
SDL_SendLocaleChangedEvent();
}
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
context:(void *)context
{
SDL_SetSystemTheme(Cocoa_GetSystemTheme());
src/video/cocoa/SDL_cocoakeyboard.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#include "SDL_cocoavideo.h"
src/video/cocoa/SDL_cocoamessagebox.h
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
extern int Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
src/video/cocoa/SDL_cocoamessagebox.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#include "SDL_cocoavideo.h"
src/video/cocoa/SDL_cocoametalview.h
+1 -1
View File
@@ -29,7 +29,7 @@
#ifndef SDL_cocoametalview_h_
#define SDL_cocoametalview_h_
#if SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
#import "../SDL_sysvideo.h"
src/video/cocoa/SDL_cocoametalview.m
+1 -1
View File
@@ -28,7 +28,7 @@
#import "SDL_cocoametalview.h"
#if SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
#if defined(SDL_VIDEO_DRIVER_COCOA) && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
#include <SDL3/SDL_syswm.h>
src/video/cocoa/SDL_cocoamodes.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_COCOA)
#include "SDL_cocoavideo.h"
src/video/cocoa/SDL_cocoamouse.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_COCOA)
#include "SDL_cocoamouse.h"
#include "SDL_cocoavideo.h"
src/video/cocoa/SDL_cocoaopengles.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA && SDL_VIDEO_OPENGL_EGL
#if defined(SDL_VIDEO_DRIVER_COCOA) && SDL_VIDEO_OPENGL_EGL
#include "SDL_cocoavideo.h"
#include "SDL_cocoaopengles.h"
src/video/cocoa/SDL_cocoashape.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_COCOA)
#include "SDL_cocoavideo.h"
#include "SDL_cocoashape.h"
src/video/cocoa/SDL_cocoavideo.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_COCOA)
#if !__has_feature(objc_arc)
#error SDL must be built with Objective-C ARC (automatic reference counting) enabled
src/video/cocoa/SDL_cocoavulkan.h
+1 -1
View File
@@ -32,7 +32,7 @@
#include "../SDL_vulkan_internal.h"
#include "../SDL_sysvideo.h"
#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA
#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_COCOA)
int Cocoa_Vulkan_LoadLibrary(_THIS, const char *path);
void Cocoa_Vulkan_UnloadLibrary(_THIS);
src/video/cocoa/SDL_cocoavulkan.m
+1 -1
View File
@@ -25,7 +25,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_COCOA
#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_COCOA)
#include "SDL_cocoavideo.h"
#include "SDL_cocoawindow.h"
src/video/cocoa/SDL_cocoawindow.m
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_COCOA
#ifdef SDL_VIDEO_DRIVER_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
#error SDL for macOS must be built with a 10.9 SDK or above.
test/testautomation_keyboard.c
+2 -2
View File
@@ -461,7 +461,7 @@ static int keyboard_setTextInputRect(void *arg)
static int keyboard_setTextInputRectNegative(void *arg)
{
/* Some platforms set also an error message; prepare for checking it */
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || defined(SDL_VIDEO_DRIVER_COCOA)
const char *expectedError = "Parameter 'rect' is invalid";
const char *error;
@@ -474,7 +474,7 @@ static int keyboard_setTextInputRectNegative(void *arg)
SDLTest_AssertPass("Call to SDL_SetTextInputRect(NULL)");
/* Some platforms set also an error message; so check it */
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_COCOA
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || defined(SDL_VIDEO_DRIVER_COCOA)
error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()");
SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");