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/Output/oss | |
| 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/Output/oss')
| -rw-r--r-- | src/plugins/Output/oss/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/plugins/Output/oss/oss.pro | 18 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt index c5cd8453e..94c18454f 100644 --- a/src/plugins/Output/oss/CMakeLists.txt +++ b/src/plugins/Output/oss/CMakeLists.txt @@ -39,11 +39,6 @@ SET(liboss_SRCS settingsdialog.cpp ) -SET(liboss_MOC_HDRS - outputossfactory.h - settingsdialog.h -) - SET(liboss_HDRS outputoss.h ) @@ -52,15 +47,13 @@ SET(liboss_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(liboss_RCC_SRCS ${liboss_RCCS}) -QT4_WRAP_CPP(liboss_MOC_SRCS ${liboss_MOC_HDRS}) - SET(liboss_UIS settingsdialog.ui ) QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS}) -ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H} +ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_UIS_H} ${liboss_RCC_SRCS} ${liboss_HDRS}) add_dependencies(oss qmmp) target_link_libraries(oss ${QT_LIBRARIES} -lqmmp) diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro index c99fcae06..4f8c9a695 100644 --- a/src/plugins/Output/oss/oss.pro +++ b/src/plugins/Output/oss/oss.pro @@ -7,7 +7,7 @@ HEADERS += outputossfactory.h \ SOURCES += outputossfactory.cpp \ - outputoss.cpp \ + outputoss.cpp \ settingsdialog.cpp TARGET=$$PLUGINS_PREFIX/Output/oss @@ -25,22 +25,6 @@ DEFINES += HAVE_SYS_SOUNDCARD_H TEMPLATE = lib LIBS += -lqmmp -TRANSLATIONS = translations/oss_plugin_cs.ts \ - translations/oss_plugin_de.ts \ - translations/oss_plugin_zh_CN.ts \ - translations/oss_plugin_zh_TW.ts \ - translations/oss_plugin_ru.ts \ - translations/oss_plugin_pl.ts \ - translations/oss_plugin_uk_UA.ts \ - translations/oss_plugin_it.ts \ - translations/oss_plugin_tr.ts \ - translations/oss_plugin_lt.ts \ - translations/oss_plugin_nl.ts \ - translations/oss_plugin_ja.ts \ - translations/oss_plugin_es.ts \ - translations/oss_plugin_sr_BA.ts \ - translations/oss_plugin_sr_RS.ts - RESOURCES = translations/translations.qrc isEmpty (LIB_DIR){ LIB_DIR = /lib |