diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-01-09 12:01:22 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-01-09 12:01:22 +0000 |
| commit | ebd7f9bc697973366de8a6bf7265051e825e0680 (patch) | |
| tree | 1feb9df1c5fe3493e9aa1dd8f5d6233a38ae9d3c /src/plugins/Transports/http | |
| parent | bc7ad688c646afd2a89e5c5ff58696f2df2c8605 (diff) | |
| download | qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.gz qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.bz2 qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.zip | |
renaming experimental branch
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Transports/http')
| -rw-r--r-- | src/plugins/Transports/http/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/plugins/Transports/http/http.pro | 20 |
2 files changed, 3 insertions, 29 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 |