diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2019-08-27 23:07:28 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-27 14:07:28 -0700 |
| commit | 6f7ef0f142a86c3cc99d59aab090b05bd18ae156 (patch) | |
| tree | 25aaa10a1c80ac0be269c6df81da3b21d1129578 | |
| parent | 32a53e1f3755960b09fc228dce23885aa7efcb8f (diff) | |
| download | vcpkg-6f7ef0f142a86c3cc99d59aab090b05bd18ae156.tar.gz vcpkg-6f7ef0f142a86c3cc99d59aab090b05bd18ae156.zip | |
magnum: Fix KHR/khrplatform.h not found on vcpkg in VS (#7926)
Signed-off-by: Squareys <squareys@googlemail.com>
| -rw-r--r-- | ports/magnum/004-khrplatform-include.patch | 13 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/magnum/004-khrplatform-include.patch b/ports/magnum/004-khrplatform-include.patch new file mode 100644 index 000000000..04d21e0ef --- /dev/null +++ b/ports/magnum/004-khrplatform-include.patch @@ -0,0 +1,13 @@ +diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h
+index 7d36f26e3..69cc8c82f 100644
+--- a/src/MagnumExternal/OpenGL/GL/flextGL.h
++++ b/src/MagnumExternal/OpenGL/GL/flextGL.h
+@@ -118,7 +118,7 @@ void flextGLInit(Magnum::GL::Context& context);
+
+ /* Data types */
+
+-#include <KHR/khrplatform.h>
++#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
+ typedef unsigned int GLenum;
+ typedef unsigned char GLboolean;
+ typedef unsigned int GLbitfield;
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 9b8d3b424..29d8ea733 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/001-sdl-includes.patch ${CMAKE_CURRENT_LIST_DIR}/002-tools-path.patch ${CMAKE_CURRENT_LIST_DIR}/003-glfw-find-module.patch + ${CMAKE_CURRENT_LIST_DIR}/004-khrplatform-include.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |