diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-03-28 04:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:37:33 -0700 |
| commit | edfce3b4558644d61fbef4c88ff4bd106b0809f8 (patch) | |
| tree | 9256e71392b4f2aa7f5c957b732bb9eb35d976fd /ports/magnum/001-sdl-includes.patch | |
| parent | 9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e (diff) | |
| download | vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.tar.gz vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.zip | |
[magnum/magnum-plugins] Fix patches for --head builds (#10158)
* [magnum] Update patches for --head builds
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Remove obsolete patch
Since basisu port has been updated, we can now use it without patching
the magnum-plugins code for compatibility.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade] Remove obsolete warning and flag
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Rename patches to reflect order of application
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade/magnum/magnum-plugins] Update port versions
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'ports/magnum/001-sdl-includes.patch')
| -rw-r--r-- | ports/magnum/001-sdl-includes.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/ports/magnum/001-sdl-includes.patch b/ports/magnum/001-sdl-includes.patch deleted file mode 100644 index b7ae6a446..000000000 --- a/ports/magnum/001-sdl-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp -index 46ade2d00..24d8eabe7 100644 ---- a/src/Magnum/Platform/Sdl2Application.cpp -+++ b/src/Magnum/Platform/Sdl2Application.cpp -@@ -26,7 +26,7 @@ - #include "Sdl2Application.h" - - #include <cstring> --#include <SDL.h> -+#include <SDL2/SDL.h> - #ifndef CORRADE_TARGET_EMSCRIPTEN - #include <tuple> - #else -diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h -index 1a50b1c72..45e88edf5 100644 ---- a/src/Magnum/Platform/Sdl2Application.h -+++ b/src/Magnum/Platform/Sdl2Application.h -@@ -46,13 +46,13 @@ - #define SDL_MAIN_HANDLED - #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_video.h> --#include <SDL_scancode.h> -+#include <SDL2/SDL_keycode.h> -+#include <SDL2/SDL_mouse.h> -+#include <SDL2/SDL_video.h> -+#include <SDL2/SDL_scancode.h> - - #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 - |