diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-07-14 17:38:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:38:18 -0700 |
| commit | 5e40afca0d7286a9a7d742822cc2a1179a9e63fc (patch) | |
| tree | 4e83343034a70f029a180a78d9fbab3971c222ba /ports/magnum/002-sdl-includes.patch | |
| parent | 9891a8f2132aa18cdc6f96862ee5406f2d901b0e (diff) | |
| download | vcpkg-5e40afca0d7286a9a7d742822cc2a1179a9e63fc.tar.gz vcpkg-5e40afca0d7286a9a7d742822cc2a1179a9e63fc.zip | |
[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211)
* [magnum] Improve maintainability of feature to cmake flag conversion
* [magnum] Ignore features not supported on current platform
Allows `vcpkg install magnum[*]` on any platform.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Add cglcontext and windowlesscglapplication features
* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Replace deprecated basisu with archive download
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Add meshoptimizersceneconverter feature
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Also use vcpkg_check_features
Analog to magnum port.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
Signed-off-by: Squareys <squareys@googlemail.com>
* [meshoptimizer] Add initial port
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Replace meshoptimizer download with feature dependency
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade,magnum-*] Fix license installation command
Signed-off-by: Squareys <squareys@googlemail.com>
* [meshoptimizer] Use vcpkg_fixup_cmake_targets
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/magnum/002-sdl-includes.patch')
| -rw-r--r-- | ports/magnum/002-sdl-includes.patch | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/ports/magnum/002-sdl-includes.patch b/ports/magnum/002-sdl-includes.patch index b7ae6a446..fb2ffed8d 100644 --- a/ports/magnum/002-sdl-includes.patch +++ b/ports/magnum/002-sdl-includes.patch @@ -1,36 +1,43 @@ diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp -index 46ade2d00..24d8eabe7 100644 +index 276c7ee55..90c52f3cb 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp -@@ -26,7 +26,7 @@ - #include "Sdl2Application.h" - - #include <cstring> +@@ -34,7 +34,7 @@ + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wpragma-pack" + #endif -#include <SDL.h> +#include <SDL2/SDL.h> - #ifndef CORRADE_TARGET_EMSCRIPTEN - #include <tuple> - #else + #ifdef CORRADE_TARGET_CLANG_CL + #pragma clang diagnostic pop + #endif diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h -index 1a50b1c72..45e88edf5 100644 +index b2426d513..176729fdb 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h -@@ -46,13 +46,13 @@ - #define SDL_MAIN_HANDLED +@@ -57,11 +57,11 @@ + #pragma clang diagnostic ignored "-Wpragma-pack" #endif /* SDL.h includes the world, adding 50k LOC. We don't want that either. */ -#include <SDL_keycode.h> -#include <SDL_mouse.h> +-#include <SDL_version.h> /* huh, why is this not pulled in implicitly?! */ -#include <SDL_video.h> -#include <SDL_scancode.h> +#include <SDL2/SDL_keycode.h> +#include <SDL2/SDL_mouse.h> ++#include <SDL2/SDL_version.h> /* huh, why is this not pulled in implicitly?! */ +#include <SDL2/SDL_video.h> +#include <SDL2/SDL_scancode.h> - + + #ifdef CORRADE_TARGET_IOS + /* Including SDL_main.h unconditionally would mean it'd override Corrade::Main +@@ -74,7 +74,7 @@ + #endif + #ifdef CORRADE_TARGET_WINDOWS_RT -#include <SDL_main.h> /* For SDL_WinRTRunApp */ +#include <SDL2/SDL_main.h> /* For SDL_WinRTRunApp */ #include <wrl.h> /* For the WinMain entrypoint */ #endif - + #ifdef CORRADE_TARGET_CLANG_CL |