Commit 0d14f9a5 authored by Urs Fleisch's avatar Urs Fleisch
Browse files

Fix building on Windows and OS X.

parent f45ede86
......@@ -49,7 +49,7 @@ test ${kernel:0:5} = "MINGW" && kernel="MINGW"
compiler="gcc"
qt_version=5.4.1
qt_version=5.5.0
zlib_version=1.2.8
zlib_patchlevel=2
libogg_version=1.3.2
......@@ -229,7 +229,7 @@ $DOWNLOAD http://ftp.de.debian.org/debian/pool/main/m/mp4v2/mp4v2_${mp4v2_versio
if test "$compiler" = "cross-mingw"; then
test -f mingw.cmake ||
cat >mingw.cmake <<EOF
set(QT_PREFIX /windows/Qt/Qt${qt_version}/${qt_version%.?}/mingw491_32)
set(QT_PREFIX /windows/Qt/Qt${qt_version}/${qt_version%.?}/mingw492_32)
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_C_COMPILER ${cross_host}-gcc)
......@@ -2185,6 +2185,9 @@ if test $(uname) = "MSYS_NT-6.1"; then
AV_CONFIGURE_OPTIONS="$AV_CONFIGURE_OPTIONS --target-os=mingw32"
fi
fi
if ( test $kernel = "Darwin" || test $kernel = "MINGW" ) && test -n "${ffmpeg_version}"; then
AV_CONFIGURE_OPTIONS="$AV_CONFIGURE_OPTIONS --disable-iconv"
fi
if test -z "$ENABLE_DEBUG"; then
AV_CONFIGURE_OPTIONS="$AV_CONFIGURE_OPTIONS --disable-debug"
else
......
......@@ -43,7 +43,7 @@ elseif (WIN32)
set(CMAKE_RC_COMPILER_INIT windres)
enable_language(RC)
set(CMAKE_RC_COMPILE_OBJECT
"<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
"<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
endif (MINGW)
# add Windows resource file with icon
set(qt_SRCS ${qt_SRCS} kid3win.rc)
......
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