diff options
| author | wangli28 <47812810+wangli28@users.noreply.github.com> | 2019-05-24 05:02:13 +0000 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-23 22:02:13 -0700 |
| commit | e37cc662ee29852f45e85961124f62d91acb488a (patch) | |
| tree | 2947519f8e2a33fdeb0cdca9350ce685b0c56d2a /ports/glbinding/fix-uwpmacro.patch | |
| parent | b565987e5c53ed4ada5b31598c5cfab32ade1b21 (diff) | |
| download | vcpkg-e37cc662ee29852f45e85961124f62d91acb488a.tar.gz vcpkg-e37cc662ee29852f45e85961124f62d91acb488a.zip | |
[librabbitmq/glbinding] Port update (#6391)
* [librabbitmq/glbinding] Port update
* fix librabbitmq uwp warning.
* [glbinding/globjects] Fix glbinding::KHRplatform was not found and globjects built failed
Diffstat (limited to 'ports/glbinding/fix-uwpmacro.patch')
| -rw-r--r-- | ports/glbinding/fix-uwpmacro.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/ports/glbinding/fix-uwpmacro.patch b/ports/glbinding/fix-uwpmacro.patch new file mode 100644 index 000000000..61c179662 --- /dev/null +++ b/ports/glbinding/fix-uwpmacro.patch @@ -0,0 +1,33 @@ +diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt
+index 97654c8..bca68d1 100644
+--- a/source/glbinding/CMakeLists.txt
++++ b/source/glbinding/CMakeLists.txt
+@@ -261,6 +261,11 @@ target_link_libraries(${target}
+ # Compile definitions
+ #
+
++
++if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++ target_compile_definitions(${target} PRIVATE SYSTEM_WINDOWS WINDOWS_STORE)
++endif()
++
+ target_compile_definitions(${target}
+ PRIVATE
+ # since we use stl and stl is intended to use exceptions, exceptions should not be disabled
+diff --git a/source/glbinding/source/getProcAddress.cpp b/source/glbinding/source/getProcAddress.cpp
+index c1cfc5c..7e5f8bc 100644
+--- a/source/glbinding/source/getProcAddress.cpp
++++ b/source/glbinding/source/getProcAddress.cpp
+@@ -18,7 +18,11 @@ namespace glbinding {
+
+ ProcAddress getProcAddress(const char * name)
+ {
+- static auto module = LoadLibrary(_T("OPENGL32.DLL"));
++#ifdef WINDOWS_STORE
++ static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0);
++#else
++ static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));
++#endif
+
+ // Prevent static linking of opengl32
+ static auto wglGetProcAddress_ = reinterpret_cast<void * (__stdcall *)(const char *)>(::GetProcAddress(module, "wglGetProcAddress"));
|