From 71b8774dcf66b898c3e763f84003bd8ea29334c3 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Tue, 4 Dec 2018 13:47:28 +0100 Subject: [PATCH] fix #279023: "Save online" doesn't work --- build/appveyor/before_build.bat | 6 +++--- mscore/CMakeLists.txt | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build/appveyor/before_build.bat b/build/appveyor/before_build.bat index ebb880f8fce4..c330249977df 100644 --- a/build/appveyor/before_build.bat +++ b/build/appveyor/before_build.bat @@ -11,11 +11,11 @@ XCOPY Jack "C:\Program Files (x86)\Jack" /E /I /Y XCOPY ccache "C:\ccache" /E /I /Y CD C:\MuseScore -mkdir dependencies -cd dependencies IF NOT EXIST dependencies.zip ( START " " /wait "C:\cygwin64\bin\wget.exe" --no-check-certificate "https://s3.amazonaws.com/utils.musescore.org/dependencies.7z" -O dependencies.zip ) +:: assumung dependencies.zip to contain the dependencies directory (with is subdirs) START " " /wait "7z" x -y dependencies.zip > nul -CD include +:: test +CD dependencies\include CD C:\MuseScore :: is MuseScore stable? Check here, no grep in PATH later on diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt index 1392f78f88e0..ed7107f492c5 100644 --- a/mscore/CMakeLists.txt +++ b/mscore/CMakeLists.txt @@ -850,6 +850,7 @@ else (MINGW) "${QT_INSTALL_BINS}/Qt5WebChannel.dll" "${QT_INSTALL_BINS}/Qt5QuickWidgets.dll" "${QT_INSTALL_BINS}/Qt5Positioning.dll" "${QT_INSTALL_BINS}/libEGL.dll" "${QT_INSTALL_BINS}/libGLESv2.dll" + "${QT_INSTALL_BINS}/libeay32.dll" "${QT_INSTALL_BINS}/libsslay32.dll" ) if (USE_WEBENGINE) list(APPEND dlls_to_copy "${QT_INSTALL_BINS}/Qt5WebEngineWidgets.dll" "${QT_INSTALL_BINS}/Qt5WebEngineCore.dll") @@ -870,8 +871,10 @@ else (MINGW) find_library( dll_vorbis NAMES "libvorbis" PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH) find_library( dll_vorbisfile NAMES "libvorbisfile" PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH) find_library( dll_portaudio NAMES "portaudio" PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH) + find_library( dll_ssl1 NAMES "libeay32" PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH) + find_library( dll_ssl2 NAMES "ssleay32" PATHS ${DEPENDENCIES_DIR} NO_DEFAULT_PATH) - list(APPEND dlls_to_copy ${dll_lame} ${dll_ogg} ${dll_sndfile} ${dll_vorbis} ${dll_vorbisfile} ${dll_portaudio} "$/${MSCORE_OUTPUT_NAME}.exe") + list(APPEND dlls_to_copy ${dll_lame} ${dll_ogg} ${dll_sndfile} ${dll_vorbis} ${dll_vorbisfile} ${dll_portaudio} ${dll_ssl1} ${dll_ssl2} "$/${MSCORE_OUTPUT_NAME}.exe") set( output_dir_for_dlls "${PROJECT_BINARY_DIR}/../msvc.install${ARCH_TYPE}/bin") COPY_FILES_INTO_DIRECTORY_IF_CHANGED( "${dlls_to_copy}" ${output_dir_for_dlls} mscore) @@ -904,6 +907,8 @@ else (MINGW) ${dll_portaudio} ${dll_vorbis} ${dll_vorbisfile} + ${dll_ssl1} + ${dll_ssl2} ${dll_winsparkle} ${QtInstallLibraries} ${QT_INSTALL_BINS}/libEGL.dll