aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-01-25 16:43:12 -0800
committerGitHub <noreply@github.com>2017-01-25 16:43:12 -0800
commit1924c0a13924dbe29be4c38ba9a25734b44ee004 (patch)
tree6872c1073d45b589424c41277d9091975ef7b1b1
parente29dfe4b0405ab7bcd8e12a3ac9ae36f9cd08088 (diff)
parentdb9ea49377ef1e393d7c8e8ac64b4cfc42bbe99c (diff)
downloadvcpkg-1924c0a13924dbe29be4c38ba9a25734b44ee004.tar.gz
vcpkg-1924c0a13924dbe29be4c38ba9a25734b44ee004.zip
Merge pull request #592 from sdcb/directxtk-non-win10
[directxtk] do not use win10 sdk
-rw-r--r--ports/directxtk/CONTROL2
-rw-r--r--ports/directxtk/portfile.cmake6
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 8a3da81a6..97f97ecd9 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
Source: directxtk
-Version: dec2016
+Version: dec2016-1
Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 08f8a4537..fc4418d75 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -19,16 +19,16 @@ ELSE()
ENDIF()
vcpkg_build_msbuild(
- PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015_Win10.sln
+ PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015.sln
PLATFORM ${BUILD_ARCH}
)
file(INSTALL
- ${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Release/DirectXTK.lib
+ ${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTK.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(INSTALL
- ${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Debug/DirectXTK.lib
+ ${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTK.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)