mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-01 16:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
b896a0da5a
vcpkg/ports/magnum/002-sdl-includes.patch

37 lines
1.1 KiB
Diff
Raw Normal View History

[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
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
[magnum] Patch SDL2 includes, msbuild compatibility Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 17:35:54 +08:00
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
index 1a50b1c72..45e88edf5 100644
[magnum] Patch SDL2 includes, msbuild compatibility Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 17:35:54 +08:00
--- a/src/Magnum/Platform/Sdl2Application.h
+++ b/src/Magnum/Platform/Sdl2Application.h
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
@@ -46,13 +46,13 @@
[magnum] Patch SDL2 includes, msbuild compatibility Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 17:35:54 +08:00
#define SDL_MAIN_HANDLED
#endif
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
/* 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>
[magnum] Patch SDL2 includes, msbuild compatibility Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 17:35:54 +08:00
-#include <SDL_scancode.h>
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
+#include <SDL2/SDL_keycode.h>
+#include <SDL2/SDL_mouse.h>
+#include <SDL2/SDL_video.h>
[magnum] Patch SDL2 includes, msbuild compatibility Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 17:35:54 +08:00
+#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
Reference in New Issue Copy Permalink