From 2216c996fa2ce4e2355af4df8a7ba3cfeddd940f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 17 Mar 2014 11:25:42 +0000 Subject: enabled enca library support under win32 (Fixes issue 641) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4176 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/cue.pro | 15 +++++++++------ src/plugins/Transports/http/http.pro | 14 +++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro index 626604c05..c8f205eec 100644 --- a/src/plugins/Input/cue/cue.pro +++ b/src/plugins/Input/cue/cue.pro @@ -21,16 +21,19 @@ TEMPLATE = lib unix{ QMAKE_LIBDIR += ../../../../lib LIBS += -lqmmp -L/usr/lib - contains(CONFIG, WITH_ENCA){ - CONFIG += link_pkgconfig - PKGCONFIG += enca - DEFINES += WITH_ENCA - } } win32{ QMAKE_LIBDIR += ../../../../bin - LIBS += -lqmmp0 + LIBS += -lqmmp0 +} + +contains(CONFIG, WITH_ENCA){ + CONFIG += link_pkgconfig + DEFINES += WITH_ENCA + unix:PKGCONFIG += enca + win32:LIBS += -lenca.dll + } TRANSLATIONS = translations/cue_plugin_ru.ts \ diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro index e65e643ef..f12d0b0b2 100644 --- a/src/plugins/Transports/http/http.pro +++ b/src/plugins/Transports/http/http.pro @@ -26,17 +26,21 @@ unix { isEmpty(LIB_DIR):LIB_DIR = /lib target.path = $$LIB_DIR/qmmp/Transports INSTALLS += target - contains(CONFIG, WITH_ENCA){ - CONFIG += link_pkgconfig - PKGCONFIG += enca - DEFINES += WITH_ENCA - } } win32 { QMAKE_LIBDIR += ../../../../bin LIBS += -lqmmp0 \ -lcurldll } + +contains(CONFIG, WITH_ENCA){ + CONFIG += link_pkgconfig + DEFINES += WITH_ENCA + unix:PKGCONFIG += enca + win32:LIBS += -lenca.dll + +} + FORMS += settingsdialog.ui TRANSLATIONS = translations/http_plugin_ru.ts \ -- cgit v1.2.3-13-gbd6f