diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2016-11-28 15:52:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 15:52:12 -0800 |
| commit | d5ac945c2c56fadfcbd98843fcbc939108760d31 (patch) | |
| tree | e27ddacc665c380e3e5f6a5da8c547804c56cb98 | |
| parent | 30369e64e9c0c5ca90d258159107328852b876c7 (diff) | |
| parent | 00f10b7789ad6d7b48c71f9f72b6ba0d8d3d1ea4 (diff) | |
| download | vcpkg-d5ac945c2c56fadfcbd98843fcbc939108760d31.tar.gz vcpkg-d5ac945c2c56fadfcbd98843fcbc939108760d31.zip | |
Merge pull request #361 from sdcb/dxutopt
[dxut] add build for optional libs.
| -rw-r--r-- | ports/dxut/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dxut/portfile.cmake | 23 |
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() |