mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 04:38:01 +08:00
5e40afca0d
* [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>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
|
|
index 276c7ee55..90c52f3cb 100644
|
|
--- a/src/Magnum/Platform/Sdl2Application.cpp
|
|
+++ b/src/Magnum/Platform/Sdl2Application.cpp
|
|
@@ -34,7 +34,7 @@
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wpragma-pack"
|
|
#endif
|
|
-#include <SDL.h>
|
|
+#include <SDL2/SDL.h>
|
|
#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 b2426d513..176729fdb 100644
|
|
--- a/src/Magnum/Platform/Sdl2Application.h
|
|
+++ b/src/Magnum/Platform/Sdl2Application.h
|
|
@@ -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
|