diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-10 15:25:06 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 08:51:17 +0300 |
commit | cd5db907261e92a27c1b43117e3976dc055246ae (patch) | |
tree | 61c755b6eb23701e98aef111155ed93c40119d4c /build_files/build_environment/patches/sdl.diff | |
parent | 6bf003bce065a7e8c36642cc3dc66f722462673f (diff) |
Build Environment: updates for macOS.
Mainly this is following Linux to build own xml2/lzma/ssl/sqlite and linking
them all statically. This ensures the Python ssl module uses a recent openssl
version rather than a very old one shipped with macOS.
Diffstat (limited to 'build_files/build_environment/patches/sdl.diff')
-rw-r--r-- | build_files/build_environment/patches/sdl.diff | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/build_files/build_environment/patches/sdl.diff b/build_files/build_environment/patches/sdl.diff index d0a3bca863d..742183ecb4c 100644 --- a/build_files/build_environment/patches/sdl.diff +++ b/build_files/build_environment/patches/sdl.diff @@ -1,4 +1,4 @@ -diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c ./src/video/SDL_video.c +diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c --- CMakeLists.txt.old 2016-01-02 12:56:31 -0700 +++ CMakeLists.txt 2016-10-03 11:24:24 -0600 @@ -609,7 +609,7 @@ @@ -10,3 +10,23 @@ diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c . if(HAVE_LIBICONV) list(APPEND EXTRA_LIBS iconv) set(HAVE_ICONV 1) +--- src/video/SDL_video.c 2018-09-10 23:27:57.000000000 +0200 ++++ src/video/SDL_video.c 2018-09-10 23:28:09.000000000 +0200 +@@ -1176,7 +1176,7 @@ + return 0; + } + +-#ifdef __MACOSX__ ++#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA + /* if the window is going away and no resolution change is necessary, + do nothing, or else we may trigger an ugly double-transition + */ +@@ -2563,7 +2563,7 @@ + return SDL_FALSE; + } + +-#ifdef __MACOSX__ ++#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA + if (SDL_strcmp(_this->name, "cocoa") == 0) { /* don't do this for X11, etc */ + if (Cocoa_IsWindowInFullscreenSpace(window)) { + return SDL_FALSE; |