aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-02-24 17:27:12 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-02-24 17:27:12 -0800
commitec02f5bb264af821369fd6de9028758ae12447f1 (patch)
treed32405f9268dac6363ff62521c8ce6b858bb9ace
parent5eae6e392a83f2f93d5d694897180ccd39f70080 (diff)
downloadvcpkg-ec02f5bb264af821369fd6de9028758ae12447f1.tar.gz
vcpkg-ec02f5bb264af821369fd6de9028758ae12447f1.zip
[opengl] Add branch for Windows 8.1 SDK
-rw-r--r--ports/opengl/CONTROL2
-rw-r--r--ports/opengl/portfile.cmake13
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL
index db748df59..e2db823cf 100644
--- a/ports/opengl/CONTROL
+++ b/ports/opengl/CONTROL
@@ -1,3 +1,3 @@
Source: opengl
-Version: 0.0-2
+Version: 0.0-3
Description: Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. \ No newline at end of file
diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake
index cc27570e6..2af9e6e3b 100644
--- a/ports/opengl/portfile.cmake
+++ b/ports/opengl/portfile.cmake
@@ -7,11 +7,13 @@ if (WINDOWS_SDK MATCHES "10.")
set(OPENGLPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib")
set(LICENSEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Licenses\\${WINDOWS_SDK}\\sdk_license.rtf")
set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Include\\${WINDOWS_SDK}\\um")
+elseif(WINDOWS_SDK MATCHES "8.")
+ set(OPENGLPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib")
+ set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Include\\um")
else()
message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}")
endif()
-
if (NOT EXISTS "${OPENGLPATH}")
message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${OPENGLPATH}")
endif()
@@ -30,5 +32,10 @@ file(COPY
)
file(COPY ${OPENGLPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY ${OPENGLPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(COPY ${LICENSEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/opengl)
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See the accompanying sdk_license.rtf")
+
+if (DEFINED LICENSEPATH)
+ file(COPY ${LICENSEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/opengl)
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See the accompanying sdk_license.rtf")
+else()
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license")
+endif() \ No newline at end of file