Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-08-14 04:19:42 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-14 04:19:42 +0300
commit1f3eb3088ffcb1ff26c903ba0a6bd978799a7510 (patch)
tree3d9ebcf73bc305bc664c007c89561936c9df96df /build_files/build_environment/patches/sdl.diff
parentfee32abee977c3d44c0ea7d098441d6261f51d3d (diff)
build_environment: sdl 2.0.8
Diffstat (limited to 'build_files/build_environment/patches/sdl.diff')
-rw-r--r--build_files/build_environment/patches/sdl.diff38
1 files changed, 0 insertions, 38 deletions
diff --git a/build_files/build_environment/patches/sdl.diff b/build_files/build_environment/patches/sdl.diff
index b309d0230f3..d0a3bca863d 100644
--- a/build_files/build_environment/patches/sdl.diff
+++ b/build_files/build_environment/patches/sdl.diff
@@ -1,33 +1,4 @@
diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c ./src/video/SDL_video.c
---- /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c 2016-01-02 20:56:31.000000000 +0100
-+++ ./src/video/SDL_video.c 2016-05-15 02:58:27.000000000 +0200
-@@ -137,7 +137,7 @@
-
- #define FULLSCREEN_MASK (SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN)
-
--#ifdef __MACOSX__
-+#if SDL_VIDEO_DRIVER_COCOA
- /* Support for Mac OS X fullscreen spaces */
- extern SDL_bool Cocoa_IsWindowInFullscreenSpace(SDL_Window * window);
- extern SDL_bool Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state);
-@@ -1141,7 +1141,7 @@
- if ( window->is_hiding && fullscreen )
- return 0;
-
--#ifdef __MACOSX__
-+#if 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
- */
-@@ -2365,7 +2365,7 @@
- return SDL_FALSE;
- }
-
--#ifdef __MACOSX__
-+#if SDL_VIDEO_DRIVER_COCOA
- if (Cocoa_IsWindowInFullscreenSpace(window)) {
- return SDL_FALSE;
- }
--- CMakeLists.txt.old 2016-01-02 12:56:31 -0700
+++ CMakeLists.txt 2016-10-03 11:24:24 -0600
@@ -609,7 +609,7 @@
@@ -39,12 +10,3 @@ 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)
-@@ -1455,7 +1455,7 @@
- set(_INSTALL_LIBS "SDL2main")
-
- if(SDL_SHARED)
-- add_library(SDL2 SHARED ${SOURCE_FILES})
-+ add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
- if(UNIX)
- set_target_properties(SDL2 PROPERTIES
- VERSION ${LT_VERSION}