aboutsummaryrefslogtreecommitdiff
path: root/ports/dxut
diff options
context:
space:
mode:
Diffstat (limited to 'ports/dxut')
-rw-r--r--ports/dxut/CONTROL4
-rw-r--r--ports/dxut/portfile.cmake51
-rw-r--r--ports/dxut/vcpkg.json8
3 files changed, 29 insertions, 34 deletions
diff --git a/ports/dxut/CONTROL b/ports/dxut/CONTROL
deleted file mode 100644
index 600462882..000000000
--- a/ports/dxut/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: dxut
-Version: 11.14-3
-Homepage: https://github.com/Microsoft/DXUT
-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 4d0a878e3..78626d1c9 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -1,18 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
- message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
-endif()
-
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz"
- FILENAME "DXUT-sept2016.tar.gz"
- SHA512 190006c194284a1f5d614477896b0469a59ece05dff37477dadbe98808a5c33e274c0c1bb1390f22d1b5e06c9f534f4b50d6002157b2a391e01c2192b8e08869
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+vcpkg_fail_port_install(ON_ARCH arm)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO microsoft/DXUT
+ REF d6e8ef60b35b8d3b97684bd6b3cee88f8ba81a3f
+ SHA512 2ac1ac4416dbf7ae0e8a9e1e95fbd8bede126ac6dc4e919f4bd1131d10f3a01e007aff2f770ace9cbf48093ff76d8b89c4b78b734658028be62e1412f44078ae
)
IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
@@ -22,31 +15,29 @@ ELSE()
ENDIF()
vcpkg_build_msbuild(
- PROJECT_PATH ${SOURCE_PATH}/DXUT_2015.sln
- PLATFORM ${BUILD_ARCH}
+ PROJECT_PATH "${SOURCE_PATH}/DXUT_2015.sln"
+ PLATFORM "${BUILD_ARCH}"
)
file(INSTALL
- ${SOURCE_PATH}/Core/
- ${SOURCE_PATH}/Optional/
- DESTINATION ${CURRENT_PACKAGES_DIR}/include
+ "${SOURCE_PATH}/Core/"
+ "${SOURCE_PATH}/Optional/"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/include"
FILES_MATCHING PATTERN "*.h"
)
file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/include/Bin)
+ "${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)
+ "${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)
+ "${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()
-file(INSTALL ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dxut RENAME copyright)
-
-message(STATUS "Installing done")
+file(INSTALL "${SOURCE_PATH}/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json
new file mode 100644
index 000000000..49517b1de
--- /dev/null
+++ b/ports/dxut/vcpkg.json
@@ -0,0 +1,8 @@
+{
+ "name": "dxut",
+ "version-string": "11.14",
+ "port-version": 4,
+ "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
+ "homepage": "https://github.com/Microsoft/DXUT",
+ "supports": "!staticcrt & windows & !arm"
+}