[sdl2] Remove no longer used patch

1 files changed, 0 insertions, 175 deletions

diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch
deleted file mode 100644
index 0e570847b..000000000
--- a/ports/sdl2/enable-winrt-cmake.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 0128c7a..bd534e4 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -5,6 +5,18 @@

- cmake_minimum_required(VERSION 2.8.11)

- project(SDL2 C CXX)

- 

-+if(WINDOWS_STORE)

-+  enable_language(CXX)

-+  cmake_minimum_required(VERSION 3.11)

-+  add_definitions(-DSDL_BUILDING_WINRT=1 -ZW)

-+  link_libraries(

-+    -nodefaultlib:vccorlib$<$<CONFIG:Debug>:d>

-+    -nodefaultlib:msvcrt$<$<CONFIG:Debug>:d>

-+    vccorlib$<$<CONFIG:Debug>:d>.lib

-+    msvcrt$<$<CONFIG:Debug>:d>.lib

-+  )

-+endif()

-+

- # !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property

- # !!! FIXME:  for the SDL2 shared library (so you get an

- # !!! FIXME:  install_name ("soname") of "@rpath/libSDL-whatever.dylib"

-@@ -1297,6 +1309,11 @@

-   file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c)

-   set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})

- 

-+  if(WINDOWS_STORE)

-+    file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp)

-+    list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES})

-+  endif()

-+

-   if(MSVC)

-     # Prevent codegen that would use the VC runtime libraries.

-     set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-")

-@@ -1342,6 +1359,9 @@

-     check_include_file(ddraw.h HAVE_DDRAW_H)

-     check_include_file(dsound.h HAVE_DSOUND_H)

-     check_include_file(dinput.h HAVE_DINPUT_H)

-+    if(WINDOWS_STORE OR VCPKG_TARGET_TRIPLET MATCHES "arm-windows")

-+      set(HAVE_DINPUT_H 0)

-+    endif()

-     check_include_file(dxgi.h HAVE_DXGI_H)

-     if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H)

-       set(HAVE_DIRECTX TRUE)

-@@ -1359,18 +1379,20 @@

-   check_include_file(audioclient.h HAVE_AUDIOCLIENT_H)

- 

-   if(SDL_AUDIO)

-+    if(NOT WINDOWS_STORE)

-     set(SDL_AUDIO_DRIVER_WINMM 1)

-     file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c)

-     set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES})

-+    endif()

-     set(HAVE_SDL_AUDIO TRUE)

- 

--    if(HAVE_DSOUND_H)

-+    if(HAVE_DSOUND_H AND NOT WINDOWS_STORE)

-       set(SDL_AUDIO_DRIVER_DSOUND 1)

-       file(GLOB DSOUND_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/directsound/*.c)

-       set(SOURCE_FILES ${SOURCE_FILES} ${DSOUND_AUDIO_SOURCES})

-     endif()

- 

--    if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H)

-+    if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H AND NOT WINDOWS_STORE)

-       set(SDL_AUDIO_DRIVER_WASAPI 1)

-       file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c)

-       set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES})

-@@ -1382,11 +1404,20 @@

-     if(NOT SDL_LOADSO)

-       message_error("SDL_VIDEO requires SDL_LOADSO, which is not enabled")

-     endif()

-+    if(WINDOWS_STORE)

-+      set(SDL_VIDEO_DRIVER_WINRT 1)

-+      file(GLOB WIN_VIDEO_SOURCES

-+        ${SDL2_SOURCE_DIR}/src/video/winrt/*.c 

-+        ${SDL2_SOURCE_DIR}/src/video/winrt/*.cpp

-+        ${SDL2_SOURCE_DIR}/src/render/direct3d11/*.cpp

-+        )

-+    else()

-     set(SDL_VIDEO_DRIVER_WINDOWS 1)

-     file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c)

-+    endif()

-     set(SOURCE_FILES ${SOURCE_FILES} ${WIN_VIDEO_SOURCES})

- 

--    if(RENDER_D3D AND HAVE_D3D_H)

-+    if(RENDER_D3D AND HAVE_D3D_H AND NOT WINDOWS_STORE)

-       set(SDL_VIDEO_RENDER_D3D 1)

-       set(HAVE_RENDER_D3D TRUE)

-     endif()

-@@ -1409,20 +1440,31 @@

-   endif()

- 

-   if(SDL_POWER)

-+    if(WINDOWS_STORE)

-+      set(SDL_POWER_WINRT 1)

-+      set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/winrt/SDL_syspower.cpp)

-+    else()

-     set(SDL_POWER_WINDOWS 1)

-     set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c)

-+    endif()

-     set(HAVE_SDL_POWER TRUE)

-   endif()

- 

-   if(SDL_FILESYSTEM)

-     set(SDL_FILESYSTEM_WINDOWS 1)

-+    if(WINDOWS_STORE)

-+      file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/winrt/*.cpp)

-+    else()

-     file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c)

-+    endif()

-     set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})

-     set(HAVE_SDL_FILESYSTEM TRUE)

-   endif()

- 

-   # Libraries for Win32 native and MinGW

-+  if(NOT WINDOWS_STORE)

-   list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 setupapi shell32)

-+  endif()

- 

-   # TODO: in configure.ac the check for timers is set on

-   # cygwin | mingw32* - does this include mingw32CE?

-@@ -1444,7 +1486,7 @@

-   set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})

- 

-   if(SDL_VIDEO)

--    if(VIDEO_OPENGL)

-+    if(VIDEO_OPENGL AND NOT WINDOWS_STORE)

-       set(SDL_VIDEO_OPENGL 1)

-       set(SDL_VIDEO_OPENGL_WGL 1)

-       set(SDL_VIDEO_RENDER_OGL 1)

-@@ -2027,12 +2069,14 @@

- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")

- 

- # Always build SDLmain

-+if(NOT WINDOWS_STORE)

- add_library(SDL2main STATIC ${SDLMAIN_SOURCES})

- target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)

- set(_INSTALL_LIBS "SDL2main")

- if (NOT ANDROID)

-   set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")

- endif()

-+endif()

- 

- if (ANDROID AND HAVE_HIDAPI)

-   set(_INSTALL_LIBS ${_INSTALL_LIBS} "hidapi")

-diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake

-index 48dd2d4..0c4fa28 100644

---- a/include/SDL_config.h.cmake

-+++ b/include/SDL_config.h.cmake

-@@ -335,6 +326,7 @@

- #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@

- #cmakedefine SDL_VIDEO_DRIVER_OFFSCREEN @SDL_VIDEO_DRIVER_OFFSCREEN@

- #cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@

-+#cmakedefine SDL_VIDEO_DRIVER_WINRT @SDL_VIDEO_DRIVER_WINRT@

- #cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@

- #cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@

- #cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@

-@@ -403,6 +404,7 @@

- #cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@

- #cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@

- #cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@

-+#cmakedefine SDL_POWER_WINRT @SDL_POWER_WINRT@

- #cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@

- #cmakedefine SDL_POWER_UIKIT @SDL_POWER_UIKIT@

- #cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@

-@@ -428,7 +430,7 @@

- #cmakedefine SDL_IPHONE_KEYBOARD @SDL_IPHONE_KEYBOARD@

- #cmakedefine SDL_IPHONE_LAUNCHSCREEN @SDL_IPHONE_LAUNCHSCREEN@

- 

--#if !defined(__WIN32__)

-+#if !defined(__WIN32__) && !defined(__WINRT__)

- #  if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)

- typedef unsigned int size_t;

- typedef signed char int8_t;