Merge pull request #2393

a6cd010 windeploy: bump icu version to 64, add libdouble-conversion.dll (stoffu)
This commit is contained in:
luigi1111 2019-10-08 15:17:02 -05:00
commit 3dbf09e7ad
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -17,13 +17,13 @@ fi
if [[ "$BUILD_TYPE" == "Release" ]]; then if [[ "$BUILD_TYPE" == "Release" ]]; then
echo "Release build" echo "Release build"
ICU_FILES=(libicudt62.dll libicuin62.dll libicuio62.dll libicutu62.dll libicuuc62.dll) ICU_FILES=(libicudt64.dll libicuin64.dll libicuio64.dll libicutu64.dll libicuuc64.dll)
else else
echo "Debug build" echo "Debug build"
ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.dll) ICU_FILES=(libicudtd64.dll libicuind64.dll libicuiod64.dll libicutud64.dll libicuucd64.dll)
fi fi
FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll) FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll)
OPENSSL_FILES=(libssl-1_1 libcrypto-1_1) OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)