diff options
| author | sigman78 <sigman78@gmail.com> | 2017-06-13 12:35:54 +0300 |
|---|---|---|
| committer | sigman78 <sigman78@gmail.com> | 2017-06-13 12:35:54 +0300 |
| commit | 61dbead6fc9dc3b27515db9fbc4d48e772f298bd (patch) | |
| tree | 5633853d26e44ab0bbdac31deae30bba59a90799 | |
| parent | 27db5c14bbe9025dd5953b6cd4accb51e4be0501 (diff) | |
| download | vcpkg-61dbead6fc9dc3b27515db9fbc4d48e772f298bd.tar.gz vcpkg-61dbead6fc9dc3b27515db9fbc4d48e772f298bd.zip | |
[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.
| -rw-r--r-- | ports/magnum/001-sdl-includes.patch | 20 | ||||
| -rw-r--r-- | ports/magnum/CONTROL | 2 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 5 |
3 files changed, 26 insertions, 1 deletions
diff --git a/ports/magnum/001-sdl-includes.patch b/ports/magnum/001-sdl-includes.patch new file mode 100644 index 000000000..afa1301d9 --- /dev/null +++ b/ports/magnum/001-sdl-includes.patch @@ -0,0 +1,20 @@ +diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h +index 99c3174..311b2c1 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 */ + #define SDL_MAIN_HANDLED + #endif +-#include <SDL.h> +-#include <SDL_scancode.h> ++#include <SDL2/SDL.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 + + diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index a110136f2..c4530c254 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,4 +1,4 @@ Source: magnum -Version: jun2017-1 +Version: jun2017-2 Build-Depends: corrade, sdl2, openal-soft Description: C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 67d1f825a..81e2123b6 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -7,6 +7,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-sdl-includes.patch +) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(BUILD_STATIC 1) else() |