mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '23beef4fc7e0d218e02ebbcd363adae63254c54d' into main

This commit is contained in:
Sam Lantinga 2023-01-12 16:21:58 -08:00
parent ef9a2593ee 23beef4fc7
commit 76e0d6a577
25 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/linux/SDL_fcitx.c
View File

@ -28,7 +28,6 @@
#ifdef SDL_VIDEO_DRIVER_X11
#include "../../video/x11/SDL_x11video.h"
#define SDL_ENABLE_SYSWM_X11
#endif
#include <SDL3/SDL_syswm.h>

1
src/core/linux/SDL_ibus.c
View File

@ -28,7 +28,6 @@
#ifdef SDL_VIDEO_DRIVER_X11
#include "../../video/x11/SDL_x11video.h"
#define SDL_ENABLE_SYSWM_X11
#endif
#include <SDL3/SDL_syswm.h>

1
src/render/direct3d/SDL_render_d3d.c
View File

@ -28,7 +28,6 @@
#include "../SDL_d3dmath.h"
#include "../../video/windows/SDL_windowsvideo.h"
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
#if SDL_VIDEO_RENDER_D3D

1
src/render/direct3d11/SDL_render_d3d11.c
View File

@ -30,7 +30,6 @@
#include "../SDL_sysrender.h"
#include "../SDL_d3dmath.h"
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
#include <d3d11_1.h>

1
src/render/direct3d11/SDL_render_winrt.cpp
View File

@ -39,7 +39,6 @@ using namespace Windows::Graphics::Display;
#include <DXGI.h>
#define SDL_ENABLE_SYSWM_WINRT
#include <SDL3/SDL_syswm.h>
#include "SDL_render_winrt.h"

1
src/render/direct3d12/SDL_render_d3d12.c
View File

@ -32,7 +32,6 @@
#include "../SDL_sysrender.h"
#include "../SDL_d3dmath.h"
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
#if defined(__XBOXONE__) || defined(__XBOXSERIES__)

2
src/render/metal/SDL_render_metal.m
View File

@ -31,11 +31,9 @@
#ifdef SDL_VIDEO_DRIVER_COCOA
#import <AppKit/NSWindow.h>
#import <AppKit/NSView.h>
#define SDL_ENABLE_SYSWM_COCOA
#endif
#ifdef SDL_VIDEO_DRIVER_UIKIT
#import <UIKit/UIKit.h>
#define SDL_ENABLE_SYSWM_UIKIT
#endif
#include <SDL3/SDL_syswm.h>

1
src/video/android/SDL_androidvulkan.c
View File

@ -33,7 +33,6 @@
#include "SDL_androidvulkan.h"
#define SDL_ENABLE_SYSWM_ANDROID
#include <SDL3/SDL_syswm.h>
int Android_Vulkan_LoadLibrary(_THIS, const char *path)

1
src/video/android/SDL_androidwindow.c
View File

@ -31,7 +31,6 @@
#include "SDL_androidvideo.h"
#include "SDL_androidwindow.h"
#define SDL_ENABLE_SYSWM_ANDROID
#include <SDL3/SDL_syswm.h>
/* Currently only one window */

1
src/video/cocoa/SDL_cocoametalview.m
View File

@ -30,7 +30,6 @@
#if SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL)
#define SDL_ENABLE_SYSWM_COCOA
#include <SDL3/SDL_syswm.h>
static int SDLCALL SDL_MetalViewEventWatch(void *userdata, SDL_Event *event)

1
src/video/cocoa/SDL_cocoavulkan.m
View File

@ -33,7 +33,6 @@
#include "SDL_cocoametalview.h"
#include "SDL_cocoavulkan.h"
#define SDL_ENABLE_SYSWM_COCOA
#include <SDL3/SDL_syswm.h>
#include <dlfcn.h>

1
src/video/cocoa/SDL_cocoawindow.m
View File

@ -41,7 +41,6 @@
#include "SDL_cocoaopengl.h"
#include "SDL_cocoaopengles.h"
#define SDL_ENABLE_SYSWM_COCOA
#include <SDL3/SDL_syswm.h>
/* #define DEBUG_COCOAWINDOW */

1
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -35,7 +35,6 @@
#include "../../core/openbsd/SDL_wscons.h"
#endif
#define SDL_ENABLE_SYSWM_KMSDRM
#include <SDL3/SDL_syswm.h>
/* KMS/DRM declarations */

1
src/video/kmsdrm/SDL_kmsdrmvulkan.c
View File

@ -32,7 +32,6 @@
#include "SDL_kmsdrmdyn.h"
#include "SDL_kmsdrmvulkan.h"
#define SDL_ENABLE_SYSWM_KMSDRM
#include <SDL3/SDL_syswm.h>
#include <sys/ioctl.h>

1
src/video/uikit/SDL_uikitmetalview.m
View File

@ -35,7 +35,6 @@
#import "SDL_uikitwindow.h"
#import "SDL_uikitmetalview.h"
#define SDL_ENABLE_SYSWM_UIKIT
#include <SDL3/SDL_syswm.h>
@implementation SDL_uikitmetalview

1
src/video/uikit/SDL_uikitvulkan.m
View File

@ -34,7 +34,6 @@
#include "SDL_uikitvulkan.h"
#include "SDL_uikitmetalview.h"
#define SDL_ENABLE_SYSWM_UIKIT
#include <SDL3/SDL_syswm.h>
#include <dlfcn.h>

1
src/video/uikit/SDL_uikitwindow.m
View File

@ -34,7 +34,6 @@
#include "SDL_uikitview.h"
#include "SDL_uikitopenglview.h"
#define SDL_ENABLE_SYSWM_UIKIT
#include <SDL3/SDL_syswm.h>
#include <Foundation/Foundation.h>

1
src/video/wayland/SDL_waylandvulkan.c
View File

@ -33,7 +33,6 @@
#include "SDL_waylandvulkan.h"
#define SDL_ENABLE_SYSWM_WAYLAND
#include <SDL3/SDL_syswm.h>
#if defined(__OpenBSD__)

1
src/video/wayland/SDL_waylandwindow.h
View File

@ -27,7 +27,6 @@
#include "../SDL_sysvideo.h"
#include "../../events/SDL_touch_c.h"
#define SDL_ENABLE_SYSWM_WAYLAND
#include <SDL3/SDL_syswm.h>
#include "SDL_waylandvideo.h"

1
src/video/windows/SDL_windowsevents.c
View File

@ -29,7 +29,6 @@
#include "../../events/SDL_touch_c.h"
#include "../../events/scancodes_windows.h"
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
/* Dropfile support */

1
src/video/windows/SDL_windowsvulkan.c
View File

@ -33,7 +33,6 @@
#include "SDL_windowsvulkan.h"
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
int WIN_Vulkan_LoadLibrary(_THIS, const char *path)

1
src/video/windows/SDL_windowswindow.c
View File

@ -38,7 +38,6 @@
/* Dropfile support */
#include <shellapi.h>
#define SDL_ENABLE_SYSWM_WINDOWS
#include <SDL3/SDL_syswm.h>
/* Windows CE compatibility */

1
src/video/winrt/SDL_winrtvideo.cpp
View File

@ -67,7 +67,6 @@ extern "C" {
#include "SDL_winrtmouse_c.h"
#include "SDL_winrtvideo_cpp.h"
#define SDL_ENABLE_SYSWM_WINRT
#include <SDL3/SDL_syswm.h>
/* Initialization/Query functions */

1
src/video/x11/SDL_x11events.c
View File

@ -37,7 +37,6 @@
#include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_touch_c.h"
#define SDL_ENABLE_SYSWM_X11
#include <SDL3/SDL_syswm.h>
#include <stdio.h>

1
src/video/x11/SDL_x11window.c
View File

@ -38,7 +38,6 @@
#include "SDL_x11opengles.h"
#endif
#define SDL_ENABLE_SYSWM_X11
#include <SDL3/SDL_syswm.h>
#define _NET_WM_STATE_REMOVE 0l