diff options
| -rw-r--r-- | src/plugins/Output/alsa/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/Output/jack/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Output/null/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/Output/oss/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/Output/pulseaudio/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/Output/waveout/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 4 |
8 files changed, 33 insertions, 16 deletions
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index 7a5bd68c8..c2e77df71 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -38,11 +38,14 @@ SET(libalsa_SRCS ) SET(libalsa_MOC_HDRS - outputalsa.h outputalsafactory.h settingsdialog.h ) +SET(libalsa_HDRS + outputalsa.h +) + SET(libalsa_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libalsa_RCC_SRCS ${libalsa_RCCS}) @@ -63,7 +66,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(ALSA_FOUND) ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H} - ${libalsa_RCC_SRCS}) + ${libalsa_RCC_SRCS} ${libalsa_HDRS}) add_dependencies(alsa qmmp) target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS}) install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 238de1a41..caafb8223 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -63,11 +63,11 @@ SET(libjack_SRCS SET(libjack_HDRS bio2jack.h + outputjack.h ) SET(libjack_MOC_HDRS outputjackfactory.h - outputjack.h ) SET(libjack_RCCS translations/translations.qrc) diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt index 80ade1b8d..0a251c614 100644 --- a/src/plugins/Output/null/CMakeLists.txt +++ b/src/plugins/Output/null/CMakeLists.txt @@ -31,10 +31,13 @@ SET(libnull_SRCS ) SET(libnull_MOC_HDRS - outputnull.h outputnullfactory.h ) +SET(libnull_HDRS + outputnull.h +) + SET(libnull_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libnull_RCC_SRCS ${libnull_RCCS}) @@ -47,7 +50,7 @@ QT4_WRAP_CPP(libnull_MOC_SRCS ${libnull_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_MOC_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS}) +ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_MOC_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS}) add_dependencies(null qmmp) target_link_libraries(null ${QT_LIBRARIES} -lqmmp) install(TARGETS null DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt index fb186b9f2..c5cd8453e 100644 --- a/src/plugins/Output/oss/CMakeLists.txt +++ b/src/plugins/Output/oss/CMakeLists.txt @@ -41,10 +41,13 @@ SET(liboss_SRCS SET(liboss_MOC_HDRS outputossfactory.h - outputoss.h settingsdialog.h ) +SET(liboss_HDRS + outputoss.h +) + SET(liboss_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(liboss_RCC_SRCS ${liboss_RCCS}) @@ -58,7 +61,7 @@ SET(liboss_UIS QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS}) ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H} - ${liboss_RCC_SRCS}) + ${liboss_RCC_SRCS} ${liboss_HDRS}) add_dependencies(oss qmmp) target_link_libraries(oss ${QT_LIBRARIES} -lqmmp) install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/oss4/CMakeLists.txt b/src/plugins/Output/oss4/CMakeLists.txt index 9131edeb0..8425d7f57 100644 --- a/src/plugins/Output/oss4/CMakeLists.txt +++ b/src/plugins/Output/oss4/CMakeLists.txt @@ -75,10 +75,13 @@ SET(liboss4_SRCS SET(liboss4_MOC_HDRS outputoss4factory.h - outputoss4.h settingsdialog.h ) +SET(liboss4_HDRS + outputoss4.h +) + SET(liboss4_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(liboss4_RCC_SRCS ${liboss4_RCCS}) @@ -92,8 +95,7 @@ SET(liboss4_UIS IF(OSS4_FOUND) QT4_WRAP_UI(liboss4_UIS_H ${liboss4_UIS}) -ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_MOC_SRCS} ${liboss4_UIS_H} - ${liboss4_RCC_SRCS}) +ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_MOC_SRCS} ${liboss4_UIS_H} ${liboss4_RCC_SRCS} ${liboss4_HDRS}) add_dependencies(oss4 qmmp) target_link_libraries(oss4 ${QT_LIBRARIES} -lqmmp) install(TARGETS oss4 DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt index 58ee17614..b7e736621 100644 --- a/src/plugins/Output/pulseaudio/CMakeLists.txt +++ b/src/plugins/Output/pulseaudio/CMakeLists.txt @@ -38,10 +38,13 @@ SET(libpulseaudio_SRCS ) SET(libpulseaudio_MOC_HDRS - outputpulseaudio.h outputpulseaudiofactory.h ) +SET(libpulseaudio_HDRS + outputpulseaudio.h +) + SET(libpulseaudio_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libpulseaudio_RCC_SRCS ${libpulseaudio_RCCS}) @@ -55,7 +58,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(PULSE_FOUND) ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H} - ${libpulseaudio_RCC_SRCS}) + ${libpulseaudio_RCC_SRCS} ${libpulseaudio_HDRS}) add_dependencies(pulseaudio qmmp) target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS}) install(TARGETS pulseaudio DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt index 425d42ed6..241b23fee 100644 --- a/src/plugins/Output/waveout/CMakeLists.txt +++ b/src/plugins/Output/waveout/CMakeLists.txt @@ -36,10 +36,13 @@ SET(libwaveout_SRCS ) SET(libwaveout_MOC_HDRS - outputwaveout.h outputwaveoutfactory.h ) +SET(libwaveout_HDRS + outputwaveout.h +) + SET(libwaveout_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS}) @@ -48,7 +51,7 @@ QT4_WRAP_CPP(libwaveout_MOC_SRCS ${libwaveout_MOC_HDRS}) IF(WINDOWS_H_FOUND) -ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_MOC_SRCS} ${libwaveout_RCC_SRCS}) +ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_MOC_SRCS} ${libwaveout_RCC_SRCS} ${libwaveout_HDRS}) add_dependencies(waveout qmmp) target_link_libraries(waveout ${QT_LIBRARIES} -lqmmp -lwinmm) install(TARGETS waveout DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index aad4268c8..826a09ade 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -81,12 +81,12 @@ SET(libqmmp_HDRS enginefactory.h metadatamanager.h volume.h + output.h ) SET(libqmmp_MOC_HDRS visual.h - output.h - outputwriter.h + outputwriter_p.h soundcore.h statehandler.h volumecontrol_p.h |