summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2023-07-25 15:47:44 -0400
committerGravatar lat9nq2023-07-25 15:47:44 -0400
commit43920aa1a01e7592d1fe93ee5b33a57b5413accf (patch)
tree916e63b24f9a8d3cab07a3db604ae8cd0c589bc2
parentMerge pull request #11095 from liamwhite/memory2 (diff)
downloadyuzu-43920aa1a01e7592d1fe93ee5b33a57b5413accf.tar.gz
yuzu-43920aa1a01e7592d1fe93ee5b33a57b5413accf.tar.xz
yuzu-43920aa1a01e7592d1fe93ee5b33a57b5413accf.zip
cmake: Download nasm from our external repo
This package download has intermittent failures due to host Internet issues (presumably), so download it ourselves from our own hosting.
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00d540f1f..af9f394f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,22 @@ if (YUZU_USE_BUNDLED_VCPKG)
136 endif() 136 endif()
137 endif() 137 endif()
138 138
139 if (MSVC)
140 set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads)
141 set(NASM_VERSION "2.16.01")
142 set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip)
143 set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip")
144
145 if (NOT EXISTS ${NASM_DESTINATION_PATH})
146 file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS)
147
148 if (NOT NASM_STATUS EQUAL 0)
149 # Warn and not fail since vcpkg is supposed to download this package for us in the first place
150 message(WARNING "External nasm vcpkg package download from ${NASM_DOWNLOAD_URL} failed with status ${NASM_STATUS}")
151 endif()
152 endif()
153 endif()
154
139 if (YUZU_TESTS) 155 if (YUZU_TESTS)
140 list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests") 156 list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
141 endif() 157 endif()