aboutsummaryrefslogtreecommitdiff
path: root/.ci/scripts
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2021-05-30 22:26:06 -0400
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2021-05-31 13:57:06 -0400
commit1914a1d21c5e1891b0c6d5ab1ffbe0464877d1e0 (patch)
tree5dee538ab010a17af315fdd76a7d60bdfc36b57b /.ci/scripts
parentf34176996e443cb79bd70ea2c72feeabac2b1430 (diff)
externals: libusb: Use autotools for MinGW
After updating to 1.0.24, MinGW fails to build libusb as a result of numerous errors. So we build libusb their way and let them update the nontrivial stuff. This only applies to MinGW: the old path is still in use for Linux toolchains as well as MSVC. This will dynamically link libusb, since I hit build errors with the old way we used to resolve the conflict with SDL2.
Diffstat (limited to '.ci/scripts')
-rwxr-xr-x.ci/scripts/windows/docker.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index 192a01fd8..feba3fd6e 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -47,3 +47,6 @@ python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/"
EXTERNALS_PATH="$(pwd)/build/externals"
FFMPEG_DLL_PATH="$(find ${EXTERNALS_PATH} -maxdepth 1 -type d | grep ffmpeg)/bin"
find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
+
+# copy libraries from yuzu.exe path
+find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'