diff options
| author | kiwixz <kiwixz@outlook.com> | 2019-02-22 01:05:19 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-21 17:05:19 -0800 |
| commit | 9446cc6729a9afbdcfe010bf0408ab703eee31a9 (patch) | |
| tree | 5252ad6f618b3caf09bc48b77f370e6c1733cc14 /scripts | |
| parent | 9aad2e8f3342a09bb1c70f552431a129895bd063 (diff) | |
| download | vcpkg-9446cc6729a9afbdcfe010bf0408ab703eee31a9.tar.gz vcpkg-9446cc6729a9afbdcfe010bf0408ab703eee31a9.zip | |
[x265] upgrade to 3.0, enable assembly (upgrade nasm to 2.14) (#5389)
* [acquire nasm] upgrade to 2.14
* [x265] upgrade to 3.0, enable assembly
* [x265] Enable assembly only on Windows
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 87b6fb4fe..1f856b69e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR) set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26) elseif(VAR MATCHES "NASM") set(PROGNAME nasm) - set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02) + set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14) set(BREW_PACKAGE_NAME "nasm") set(APT_PACKAGE_NAME "nasm") - set(URL - "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip" - "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip" - ) - set(ARCHIVE "nasm-2.12.02-win32.zip") - set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36) + set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip") + set(ARCHIVE "nasm-2.14-win32.zip") + set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a) elseif(VAR MATCHES "YASM") set(PROGNAME yasm) set(SUBDIR 1.3.0.6) |