mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 22:48:00 +08:00
edfce3b455
* [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>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
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
|
|
|