aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Transports
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Transports')
-rw-r--r--src/plugins/Transports/http/CMakeLists.txt12
-rw-r--r--src/plugins/Transports/http/http.pro20
-rw-r--r--src/plugins/Transports/mms/CMakeLists.txt12
-rw-r--r--src/plugins/Transports/mms/mms.pro20
4 files changed, 5 insertions, 59 deletions
diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt
index c310990a0..793dde428 100644
--- a/src/plugins/Transports/http/CMakeLists.txt
+++ b/src/plugins/Transports/http/CMakeLists.txt
@@ -46,13 +46,6 @@ SET(libhttp_SRCS
settingsdialog.cpp
)
-SET(libhttp_MOC_HDRS
- httpinputfactory.h
- httpinputsource.h
- httpstreamreader.h
- settingsdialog.h
-)
-
# resources
SET(libhttp_RCCS translations/translations.qrc)
QT4_ADD_RESOURCES(libhttp_RCC_SRCS ${libhttp_RCCS})
@@ -64,15 +57,12 @@ SET(libhttp_UIS
QT4_WRAP_UI(libhttp_UIS_H ${libhttp_UIS})
-
-QT4_WRAP_CPP(libhttp_MOC_SRCS ${libhttp_MOC_HDRS})
-
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
IF(CURL_FOUND)
-ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_MOC_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS})
+ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS})
IF(USE_ENCA AND ENCA_FOUND)
target_link_libraries(http ${QT_LIBRARIES} -lqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS})
diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro
index f12d0b0b2..c844c52ce 100644
--- a/src/plugins/Transports/http/http.pro
+++ b/src/plugins/Transports/http/http.pro
@@ -18,7 +18,7 @@ CONFIG += warn_on \
plugin \
link_pkgconfig
TEMPLATE = lib
-unix {
+unix {
QMAKE_LIBDIR += ../../../../lib
LIBS += -lqmmp \
-L/usr/lib
@@ -27,7 +27,7 @@ unix {
target.path = $$LIB_DIR/qmmp/Transports
INSTALLS += target
}
-win32 {
+win32 {
QMAKE_LIBDIR += ../../../../bin
LIBS += -lqmmp0 \
-lcurldll
@@ -43,20 +43,4 @@ contains(CONFIG, WITH_ENCA){
FORMS += settingsdialog.ui
-TRANSLATIONS = translations/http_plugin_ru.ts \
- translations/http_plugin_uk_UA.ts \
- translations/http_plugin_zh_CN.ts \
- translations/http_plugin_zh_TW.ts \
- translations/http_plugin_cs.ts \
- translations/http_plugin_pl.ts \
- translations/http_plugin_de.ts \
- translations/http_plugin_it.ts \
- translations/http_plugin_tr.ts \
- translations/http_plugin_lt.ts \
- translations/http_plugin_nl.ts \
- translations/http_plugin_ja.ts \
- translations/http_plugin_es.ts \
- translations/http_plugin_sr_BA.ts \
- translations/http_plugin_sr_RS.ts
-
RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt
index 3a1ec888a..b5c365548 100644
--- a/src/plugins/Transports/mms/CMakeLists.txt
+++ b/src/plugins/Transports/mms/CMakeLists.txt
@@ -40,13 +40,6 @@ SET(libmms_SRCS
settingsdialog.cpp
)
-SET(libmms_MOC_HDRS
- mmsinputfactory.h
- mmsinputsource.h
- mmsstreamreader.h
- settingsdialog.h
-)
-
# resources
SET(libmms_RCCS translations/translations.qrc)
QT4_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS})
@@ -58,14 +51,11 @@ SET(libmms_UIS
QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS})
-
-QT4_WRAP_CPP(libmms_MOC_SRCS ${libmms_MOC_HDRS})
-
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
IF(MMS_FOUND)
-ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_MOC_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS})
+ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS})
target_link_libraries(mms ${QT_LIBRARIES} -lqmmp ${MMS_LDFLAGS})
add_dependencies(mms qmmp)
install(TARGETS mms DESTINATION ${LIB_DIR}/qmmp/Transports)
diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro
index 9354a7eec..bf1cd1b92 100644
--- a/src/plugins/Transports/mms/mms.pro
+++ b/src/plugins/Transports/mms/mms.pro
@@ -18,7 +18,7 @@ CONFIG += warn_on \
plugin \
link_pkgconfig
TEMPLATE = lib
-
+
QMAKE_LIBDIR += ../../../../lib
LIBS += -lqmmp -L/usr/lib
PKGCONFIG += libmms
@@ -26,24 +26,6 @@ isEmpty(LIB_DIR):LIB_DIR = /lib
target.path = $$LIB_DIR/qmmp/Transports
INSTALLS += target
-
FORMS += settingsdialog.ui
-TRANSLATIONS = translations/mms_plugin_ru.ts \
- translations/mms_plugin_uk_UA.ts \
- translations/mms_plugin_zh_CN.ts \
- translations/mms_plugin_zh_TW.ts \
- translations/mms_plugin_cs.ts \
- translations/mms_plugin_pl.ts \
- translations/mms_plugin_de.ts \
- translations/mms_plugin_it.ts \
- translations/mms_plugin_tr.ts \
- translations/mms_plugin_lt.ts \
- translations/mms_plugin_nl.ts \
- translations/mms_plugin_ja.ts \
- translations/mms_plugin_es.ts \
- translations/mms_plugin_sr_BA.ts \
- translations/mms_plugin_sr_RS.ts
-
-
RESOURCES = translations/translations.qrc