Merge pull request #2177

a4928ba windeploy: deploy libssl and libcrypto binaries (xiphon)
This commit is contained in:
luigi1111 2019-06-05 22:29:33 -05:00
commit 1c3201b17f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -25,12 +25,16 @@ 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)
OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)
platform=$(get_platform) platform=$(get_platform)
if [[ "$platform" == "mingw64" ]]; then if [[ "$platform" == "mingw64" ]]; then
PLATFORM_FILES="libgcc_s_seh-1.dll" PLATFORM_FILES="libgcc_s_seh-1.dll"
OPENSSL_SUFFIX="-x64"
elif [[ "$platform" == "mingw32" ]]; then elif [[ "$platform" == "mingw32" ]]; then
PLATFORM_FILES="libgcc_s_dw2-1.dll" PLATFORM_FILES="libgcc_s_dw2-1.dll"
OPENSSL_SUFFIX = ""
fi fi
for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
@ -39,4 +43,6 @@ for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
for f in "${OPENSSL_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f$OPENSSL_SUFFIX.dll $TARGET || exit 1; done
cp $ROOT_DIR/start-low-graphics-mode.bat $TARGET cp $ROOT_DIR/start-low-graphics-mode.bat $TARGET