aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsdcb <sdflysha@qq.com>2016-11-28 13:06:48 +0800
committersdcb <sdflysha@qq.com>2016-11-28 13:06:48 +0800
commit00f10b7789ad6d7b48c71f9f72b6ba0d8d3d1ea4 (patch)
tree11a3ad54a7bbb1d52ed7da435ab43ae4fc89b16c
parentbc8a015889caa63c4d3ebac06714b1b5601e638e (diff)
downloadvcpkg-00f10b7789ad6d7b48c71f9f72b6ba0d8d3d1ea4.tar.gz
vcpkg-00f10b7789ad6d7b48c71f9f72b6ba0d8d3d1ea4.zip
[dxut] add build for optional libs.
-rw-r--r--ports/dxut/CONTROL2
-rw-r--r--ports/dxut/portfile.cmake23
2 files changed, 13 insertions, 12 deletions
diff --git a/ports/dxut/CONTROL b/ports/dxut/CONTROL
index 56fefdb32..372a98d72 100644
--- a/ports/dxut/CONTROL
+++ b/ports/dxut/CONTROL
@@ -1,3 +1,3 @@
Source: dxut
-Version: 11.14-1
+Version: 11.14-2
Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications \ No newline at end of file
diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake
index 294f64a1f..97dc8b2e3 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -11,33 +11,34 @@ vcpkg_download_distfile(ARCHIVE_FILE
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
-vcpkg_build_msbuild(
- PROJECT_PATH ${SOURCE_PATH}/Core/DXUT_2015.vcxproj
-)
-
IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
SET(BUILD_ARCH "Win32")
ELSE()
SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
ENDIF()
+vcpkg_build_msbuild(
+ PROJECT_PATH ${SOURCE_PATH}/DXUT_2015.sln
+ PLATFORM ${BUILD_ARCH}
+)
+
file(INSTALL
- ${SOURCE_PATH}/Core/DDSTextureLoader.h
- ${SOURCE_PATH}/Core/DXErr.h
- ${SOURCE_PATH}/Core/DXUT.h
- ${SOURCE_PATH}/Core/DXUTDevice11.h
- ${SOURCE_PATH}/Core/DXUTmisc.h
- ${SOURCE_PATH}/Core/Screengrab.h
- ${SOURCE_PATH}/Core/WICTextureLoader.h
+ ${SOURCE_PATH}/Core/
+ ${SOURCE_PATH}/Optional/
DESTINATION ${CURRENT_PACKAGES_DIR}/include
+ FILES_MATCHING PATTERN "*.h"
)
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/include/Bin)
file(INSTALL
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib
+ ${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(INSTALL
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib
+ ${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
vcpkg_copy_pdbs()