From b8221be7baf7072b66e66bf74758d88e48ea7457 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 31 Jan 2018 17:18:50 +0000 Subject: fixed build git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7829 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/ffmpeg.pro | 2 -- src/plugins/Input/mpeg/decodermpegfactory.cpp | 2 +- src/plugins/Input/mpeg/mpeg.pro | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index aa3b57a34..cd34648b0 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -27,7 +27,5 @@ unix { } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h LIBS += -lavcodec.dll -lavformat.dll -lavutil.dll } diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index 62c778b20..5ef6f1ecd 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -301,7 +301,7 @@ void DecoderMPEGFactory::showAbout(QWidget *parent) .arg(MAD_VERSION_PATCH) .arg(MAD_VERSION_EXTRA) + "\n" + #endif -#ifdef WITH_MAD +#ifdef WITH_MPG123 tr("mpg123, API version: %1") .arg(MPG123_API_VERSION) + "\n" + #endif diff --git a/src/plugins/Input/mpeg/mpeg.pro b/src/plugins/Input/mpeg/mpeg.pro index 5960a5f3a..59f5322ba 100644 --- a/src/plugins/Input/mpeg/mpeg.pro +++ b/src/plugins/Input/mpeg/mpeg.pro @@ -20,7 +20,7 @@ contains(CONFIG, WITH_MAD){ DEFINES += WITH_MAD } -contains(CONFIG, WITH_MPG123){ +unix:contains(CONFIG, WITH_MPG123){ HEADERS += decoder_mpg123.h SOURCES += decoder_mpg123.cpp DEFINES += WITH_MPG123 -- cgit v1.2.3-13-gbd6f