Commit 06437db8 authored by Urs Fleisch's avatar Urs Fleisch
Browse files

Back to MinGW from Qt (g++ 4.4.0, ...) for build on Windows.

The newer MingGW (g++ 4.5.2, ...) worked with dumpbin, but made problems
when debugging aborts within Qt.
parent ebc37ece
......@@ -302,7 +302,7 @@ if(WITH_ID3LIB)
message(FATAL_ERROR "Could not find zlib")
endif (_ZLIB_PATH_NAME)
set(ID3LIB_DEFINITIONS -DID3LIB_LINKOPTION=1)
set(ID3LIB_LIBRARIES ${ID3LIB_LIBRARIES} "-L${_ZLIB_PATH}" -lz -liconv -lstdc++)
set(ID3LIB_LIBRARIES ${ID3LIB_LIBRARIES} "-L${_ZLIB_PATH}" -lz -lstdc++)
elseif (APPLE)
set(ID3LIB_LIBRARIES ${ID3LIB_LIBRARIES} -lz -liconv)
endif (WIN32)
......
......@@ -8,8 +8,8 @@
# For Windows:
#
# Building the libraries needs msys/MinGW, CMake, yasm.
# There is a bundle with msys/MinGW at
# http://sourceforge.net/projects/mingwbundle/files/mingw-msys-bundle-0.4/mingw-msys-0.4-x86.zip
# You should use the MinGW which comes with Qt and add msys tools to build
# the libraries.
# Download yasm from
# http://www.tortall.net/projects/yasm/releases/yasm-1.2.0-win32.exe
# and copy it into msys /bin as yasm.exe.
......
......@@ -131,4 +131,15 @@ else (WITH_KDE)
endif (APPLE OR WIN32)
if (WIN32)
# Unfortunately, the binutils which come with the gcc-4.4.0 in the MinGW
# for Qt generate an executable which cannot be analyzed with dumpbin.
# This happens when Kid3 is linked with libav (used with Chromaprint).
# Therefore, the dependencies for kid3.exe are not added to the bundle.
# This workaround adds the missing files.
install(FILES "${QT_BINARY_DIR}/QtNetwork4.dll"
"${QT_BINARY_DIR}/QtXml4.dll"
DESTINATION ${WITH_BINDIR})
endif (WIN32)
endif (WITH_KDE)
set QTDIR=C:\Qt\4.8.1
set MSYSDIR=C:\msys\1.0
set MINGWDIR=C:\MinGW
set MINGWDIR=C:\msys\1.0\mingw
set PERLDIR=%HOME%\prg\Perl
set DUMPBINDIR=%HOME%\prg\dumpbin
set CMAKEDIR=%HOME%\prg\cmake-2.8.6-win32-x86
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment