mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[magnum] Update patches (#5730)
Signed-off-by: Squareys <squareys@googlemail.com>
This commit is contained in:
parent
14bc52eb39
commit
08882c6740
@ -1,14 +1,31 @@
|
||||
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 99c3174..311b2c1 100644
|
||||
index 1a50b1c72..45e88edf5 100644
|
||||
--- a/src/Magnum/Platform/Sdl2Application.h
|
||||
+++ b/src/Magnum/Platform/Sdl2Application.h
|
||||
@@ -42,11 +42,11 @@
|
||||
#ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */
|
||||
@@ -46,13 +46,13 @@
|
||||
#define SDL_MAIN_HANDLED
|
||||
#endif
|
||||
-#include <SDL.h>
|
||||
/* 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.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
|
||||
@ -17,4 +34,3 @@ index 99c3174..311b2c1 100644
|
||||
#include <wrl.h> /* For the WinMain entrypoint */
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake
|
||||
index e831fdb2..b2dba97f 100644
|
||||
index 5e13798f7..d7cb12b03 100644
|
||||
--- a/modules/FindGLFW.cmake
|
||||
+++ b/modules/FindGLFW.cmake
|
||||
@@ -39,7 +39,7 @@
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
@@ -64,7 +64,7 @@ if(TARGET glfw)
|
||||
endif()
|
||||
|
||||
# In case no config file was found, try manually finding the library.
|
||||
-find_library(GLFW_LIBRARY NAMES glfw glfw3)
|
||||
+find_library(GLFW_LIBRARY NAMES glfw glfw3 glfw3dll)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user