iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix libz usage under windows to match the MinGW files from sourceforge

Browse Source
This commit is contained in:
craig.p.drummond
2015-03-02 20:41:59 +00:00
parent 72324b2250
commit 57261d1602
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@@ -921,7 +921,7 @@ This assumes the following folder structure:
4. Unzip this *within* icons/
5. Call cmake (e.g. from build folder):
cmake ../src -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DCANTATA_MINGW_LIBS=z:/dev/MinGW/bin/mingwm10.dll;z:/dev/MinGW/bin/libgcc_s_dw2-1.dll -DCANTATA_OXYGEN_DIR=z:/cantata/icons -DCMAKE_BUILD_TYPE=Release
cmake ../src -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/lib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DCANTATA_MINGW_LIBS=z:/dev/MinGW/bin/mingwm10.dll;z:/dev/MinGW/bin/libgcc_s_dw2-1.dll -DCANTATA_OXYGEN_DIR=z:/cantata/icons
(Note: -DENABLE_TAGLIB=OFF stops cmake from trying to find TagLib, as the
TagLib settings have been manually set)
@@ -965,7 +965,7 @@ This assumes the following folder structure:
4. Unzip this *within* icons/
5. Load cantata's CMakeLists.txt in QtCreator, and pass the following to cmake:
../src -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DENABLE_QT5=ON -DCANTATA_OXYGEN_DIR=z:/cantata/icons -DCMAKE_BUILD_TYPE=Release
../src -DCMAKE_BUILD_TYPE=Release -DENABLE_TAGLIB=OFF -DTAGLIB_FOUND=1 -DTAGLIB_INCLUDES=z:/dev/taglib/include -DTAGLIB_LIBRARIES=z:/dev/taglib/lib/libtag.dll.a -DTAGLIB_MP4_FOUND=1 -DTAGLIB_ASF_FOUND=1 -DTAGLIB_CAN_SAVE_ID3VER=1 -DZLIB_INCLUDE_DIR=z:/dev/zlib/include -DZLIB_LIBRARY=z:/dev/zlib/lib/libz.dll.a -DCMAKE_INSTALL_PREFIX=z:/cantata/install -DCANTATA_WINDOWS_INSTALLER_DEST=z:/cantata -DENABLE_QT5=ON -DCANTATA_OXYGEN_DIR=z:/cantata/icons
(Note: -DENABLE_TAGLIB=OFF stops cmake from trying to find TagLib, as the
TagLib settings have been manually set)

4
windows/CMakeLists.txt
View File

@@ -26,7 +26,7 @@ if (ENABLE_QT5)
${QT_BINARY_DIR}/Qt5Widgets.dll ${QT_BINARY_DIR}/Qt5WinExtras.dll
${CMAKE_CURRENT_SOURCE_DIR}/icu/icudt52.dll ${QT_BINARY_DIR}/icuin52.dll ${QT_BINARY_DIR}/icuuc52.dll
${QT_BINARY_DIR}/libgcc_s_dw2-1.dll ${QT_BINARY_DIR}/libstdc++-6.dll ${QT_BINARY_DIR}/libwinpthread-1.dll
${ZLIB_INCLUDE_DIR}/../bin/zlib1.dll ${TAGLIB_INCLUDES}/../bin/libtag.dll)
${ZLIB_INCLUDE_DIR}/../bin/libz-1.dll ${TAGLIB_INCLUDES}/../bin/libtag.dll)
else (ENABLE_QT5)
configure_file(cantata.nsi.cmake ${CMAKE_CURRENT_BINARY_DIR}/cantata.nsi)
configure_file(cantata.iss.cmake ${CMAKE_CURRENT_BINARY_DIR}/cantata.iss)
@@ -41,7 +41,7 @@ else (ENABLE_QT5)
# Qt, taglib, and zlib libraries...
set(EXTRA_WIN_LIBS
${QT_BINARY_DIR}/QtCore4.dll ${QT_BINARY_DIR}/QtGui4.dll ${QT_BINARY_DIR}/QtNetwork4.dll ${QT_BINARY_DIR}/QtSvg4.dll ${QT_BINARY_DIR}/QtXml4.dll
${ZLIB_INCLUDE_DIR}/../bin/zlib1.dll ${TAGLIB_INCLUDES}/../bin/libtag.dll ${CANTATA_MINGW_LIBS})
${ZLIB_INCLUDE_DIR}/../bin/libz-1.dll ${TAGLIB_INCLUDES}/../bin/libtag.dll ${CANTATA_MINGW_LIBS})
endif (ENABLE_QT5)
# Qt translation files...

3
windows/cantata-qt5.nsi.cmake
View File

@@ -112,7 +112,7 @@ section "install"
file "libstdc++-6.dll"
file "libtag.dll"
file "libwinpthread-1.dll"
file "zlib1.dll"
file "libz-1.dll"
setOutPath $INSTDIR\config
file "config\lyrics_providers.xml"
file "config\podcast_directories.xml"
@@ -731,6 +731,7 @@ section "uninstall"
delete "$INSTDIR\libstdc++-6.dll"
delete "$INSTDIR\libwinpthread-1.dll"
delete "$INSTDIR\zlib1.dll"
delete "$INSTDIR\libz-1.dll"
delete "$INSTDIR\translations\cantata_cs.qm"
delete "$INSTDIR\translations\cantata_de.qm"

3
windows/cantata.nsi.cmake
View File

@@ -100,7 +100,7 @@ section "install"
file "Qt4 README.txt"
file "Qt License (LGPL V2).txt"
file "TagLib README.txt"
file "zlib1.dll"
file "libz-1.dll"
file "libgcc_s_dw2-1.dll"
file "libtag.dll"
file "mingwm10.dll"
@@ -736,6 +736,7 @@ section "uninstall"
delete "$INSTDIR\translations\qt_zh_CN.qm"
delete "$INSTDIR\translations\qt_zh_TW.qm"
delete "$INSTDIR\zlib1.dll"
delete "$INSTDIR\libz-1.dll"
rmDir $INSTDIR\config
rmDir $INSTDIR\helpers