mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 14:49:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
a070c1fffd
vcpkg/ports/magnum/002-sdl-includes-head.patch

44 lines
1.5 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
[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>
2020-03-28 11:37:33 +08:00
index 276c7ee55..90c52f3cb 100644
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
--- a/src/Magnum/Platform/Sdl2Application.cpp
+++ b/src/Magnum/Platform/Sdl2Application.cpp
[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>
2020-03-28 11:37:33 +08:00
@@ -34,7 +34,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpragma-pack"
#endif
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
-#include <SDL.h>
+#include <SDL2/SDL.h>
[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>
2020-03-28 11:37:33 +08:00
#ifdef CORRADE_TARGET_CLANG_CL
#pragma clang diagnostic pop
#endif
[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/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>
2020-03-28 11:37:33 +08:00
index b2426d513..176729fdb 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/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>
2020-03-28 11:37:33 +08:00
@@ -57,11 +57,11 @@
#pragma clang diagnostic ignored "-Wpragma-pack"
[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
#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>
[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>
2020-03-28 11:37:33 +08:00
-#include <SDL_version.h> /* huh, why is this not pulled in implicitly?! */
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
-#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>
[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>
2020-03-28 11:37:33 +08:00
+#include <SDL2/SDL_version.h> /* huh, why is this not pulled in implicitly?! */
[magnum] Update patches (#5730) Signed-off-by: Squareys <squareys@googlemail.com>
2019-03-20 04:08:18 +08:00
+#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>
[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>
2020-03-28 11:37:33 +08:00
#ifdef CORRADE_TARGET_IOS
/* Including SDL_main.h unconditionally would mean it'd override Corrade::Main
@@ -74,7 +74,7 @@
#endif
[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
#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
[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>
2020-03-28 11:37:33 +08:00
#ifdef CORRADE_TARGET_CLANG_CL
Reference in New Issue Copy Permalink