diff options
| -rwxr-xr-x | clear_cmake.sh | 42 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Input/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Input/flac/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Input/mad/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Input/mpc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Input/vorbis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Output/alsa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Output/jack/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Output/oss/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/qmmp/Visual/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/qmmp/Visual/analyzer/CMakeLists.txt | 70 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 154 |
14 files changed, 190 insertions, 104 deletions
diff --git a/clear_cmake.sh b/clear_cmake.sh index 5ce36d0b9..ca1f7e53f 100755 --- a/clear_cmake.sh +++ b/clear_cmake.sh @@ -1,55 +1,63 @@ #!/bin/sh -clean () { rm -rf CMakeFiles; rm -f Makefile; rm -f cmake_install.cmake; rm -f CMakeCache.txt; } +clear () { rm -rf CMakeFiles; rm -f Makefile; rm -f cmake_install.cmake; rm -f CMakeCache.txt; } -make clean -clean +make clear +clear #clear src cd src -clean +clear cd .. #clear lib cd lib -clean +clear #clear qmmp cd qmmp -clean +clear #clear Input cd Input -clean +clear #clear ffmpeg cd ffmpeg -clean +clear #clear mad cd .. cd mad -clean +clear #clear mpc cd .. cd mpc -clean +clear #clear flac cd .. cd flac -clean +clear #clear vorbis cd .. cd vorbis -clean +clear #clear Output cd .. cd .. cd Output -clean +clear #clear alsa cd alsa -clean +clear #clear jack cd .. cd jack -clean -#clean oss +clear +#clear oss cd .. cd oss -clean +clear +#clear visual +cd .. +cd .. +cd Visual +clear +cd analyzer +clear + diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 3996c47fa..f1bfd39e2 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -62,4 +62,4 @@ EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#endif\"" >> ./config.h) ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) target_link_libraries(qmmp ${QT_LIBRARIES} curl) -install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR}) +install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR} PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/CMakeLists.txt b/lib/qmmp/CMakeLists.txt index 26ad9b3ef..85c3b020e 100644 --- a/lib/qmmp/CMakeLists.txt +++ b/lib/qmmp/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(Input) add_subdirectory(Output) - +add_subdirectory(Visual) diff --git a/lib/qmmp/Input/ffmpeg/CMakeLists.txt b/lib/qmmp/Input/ffmpeg/CMakeLists.txt index 6d912fd0e..1ca0d4b7a 100644 --- a/lib/qmmp/Input/ffmpeg/CMakeLists.txt +++ b/lib/qmmp/Input/ffmpeg/CMakeLists.txt @@ -90,5 +90,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS}) target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) -install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Input/flac/CMakeLists.txt b/lib/qmmp/Input/flac/CMakeLists.txt index 33d972a6c..24041608c 100644 --- a/lib/qmmp/Input/flac/CMakeLists.txt +++ b/lib/qmmp/Input/flac/CMakeLists.txt @@ -82,5 +82,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(flac SHARED ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_UIS_H} ${libflac_RCC_SRCS}) target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LINK_FLAGS} ${FLAC_CFLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) -install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Input/mad/CMakeLists.txt b/lib/qmmp/Input/mad/CMakeLists.txt index 98b636d61..3e4dfa9d0 100644 --- a/lib/qmmp/Input/mad/CMakeLists.txt +++ b/lib/qmmp/Input/mad/CMakeLists.txt @@ -87,4 +87,4 @@ ADD_LIBRARY(mad SHARED ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS}) target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) -install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Input/mpc/CMakeLists.txt b/lib/qmmp/Input/mpc/CMakeLists.txt index 341f615f8..dccd6dd6b 100644 --- a/lib/qmmp/Input/mpc/CMakeLists.txt +++ b/lib/qmmp/Input/mpc/CMakeLists.txt @@ -76,7 +76,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mpc SHARED ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_UIS_H} ${libmpc_RCC_SRCS}) target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp -lmpcdec ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) -install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) # clean remaining files diff --git a/lib/qmmp/Input/vorbis/CMakeLists.txt b/lib/qmmp/Input/vorbis/CMakeLists.txt index e814b8c1c..baf5bad8c 100644 --- a/lib/qmmp/Input/vorbis/CMakeLists.txt +++ b/lib/qmmp/Input/vorbis/CMakeLists.txt @@ -93,4 +93,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(vorbis SHARED ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_UIS_H} ${libvorbis_RCC_SRCS}) target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LINK_FLAGS} ${VORBISFILE_LINK_FLAGS} ${OGG_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) -install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) +install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Output/alsa/CMakeLists.txt b/lib/qmmp/Output/alsa/CMakeLists.txt index f543879fd..92f7af8d9 100644 --- a/lib/qmmp/Output/alsa/CMakeLists.txt +++ b/lib/qmmp/Output/alsa/CMakeLists.txt @@ -61,5 +61,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(alsa SHARED ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H} ${libalsa_RCC_SRCS}) target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp -lasound) -install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output) +install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Output/jack/CMakeLists.txt b/lib/qmmp/Output/jack/CMakeLists.txt index 81a476301..665a6fb13 100644 --- a/lib/qmmp/Output/jack/CMakeLists.txt +++ b/lib/qmmp/Output/jack/CMakeLists.txt @@ -70,5 +70,5 @@ QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS}) ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS}) target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LINK_FLAGS} ${SAMPLERATE_LINK_FLAGS}) -install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output) +install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Output/oss/CMakeLists.txt b/lib/qmmp/Output/oss/CMakeLists.txt index 640327c48..8ab6f8d88 100644 --- a/lib/qmmp/Output/oss/CMakeLists.txt +++ b/lib/qmmp/Output/oss/CMakeLists.txt @@ -63,5 +63,5 @@ QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS}) ADD_LIBRARY(oss SHARED ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H}) target_link_libraries(oss ${QT_LIBRARIES} -lqmmp ) -install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output) +install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/lib/qmmp/Visual/CMakeLists.txt b/lib/qmmp/Visual/CMakeLists.txt new file mode 100644 index 000000000..df35bdf14 --- /dev/null +++ b/lib/qmmp/Visual/CMakeLists.txt @@ -0,0 +1,8 @@ +SET(USE_ANALYZER TRUE CACHE BOOL "enable/disable analyzer plugin") + +IF(USE_ANALYZER) +MESSAGE( STATUS "ANALYZER ON") +add_subdirectory(analyzer) +ELSE(USE_ANALYZER) +MESSAGE( STATUS "ANALYZER OFF") +ENDIF(USE_ANALYZER) diff --git a/lib/qmmp/Visual/analyzer/CMakeLists.txt b/lib/qmmp/Visual/analyzer/CMakeLists.txt new file mode 100644 index 000000000..7de2ca687 --- /dev/null +++ b/lib/qmmp/Visual/analyzer/CMakeLists.txt @@ -0,0 +1,70 @@ +project(libanalyzer) + +cmake_minimum_required(VERSION 2.4.0) + + + +INCLUDE(FindQt4) + +find_package(Qt4 REQUIRED) # find and setup Qt4 for this project +include(${QT_USE_FILE}) + +# qt plugin +ADD_DEFINITIONS( -Wall ) +ADD_DEFINITIONS(${QT_DEFINITIONS}) +ADD_DEFINITIONS(-DQT_PLUGIN) +ADD_DEFINITIONS(-DQT_NO_DEBUG) +ADD_DEFINITIONS(-DQT_SHARED) +ADD_DEFINITIONS(-DQT_THREAD) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +SET(QT_INCLUDES + ${QT_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR}/../../../ +) + +# libqmmp +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) + +SET(libanalyzer_SRCS + analyzer.cpp + colorwidget.cpp + settingsdialog.cpp + visualanalyzerfactory.cpp + fft.c +) + +SET(libanalyzer_MOC_HDRS + analyzer.h + colorwidget.h + fft.h + inlines.h + settingsdialog.h + visualanalyzerfactory.h +) + +#SET(libanalyzer_RCCS translations/translations.qrc) + +#QT4_ADD_RESOURCES(libanalyzer_RCC_SRCS ${libanalyzer_RCCS}) + +QT4_WRAP_CPP(libanalyzer_MOC_SRCS ${libanalyzer_MOC_HDRS}) + +# user interface + + +SET(libanalyzer_UIS + settingsdialog.ui +) + +QT4_WRAP_UI(libanalyzer_UIS_H ${libanalyzer_UIS}) +# Don't forget to include output directory, otherwise +# the UI file won't be wrapped! +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +ADD_LIBRARY(analyzer SHARED ${libanalyzer_SRCS} ${libanalyzer_MOC_SRCS} ${libanalyzer_UIS_H} + ${libanalyzer_RCC_SRCS}) +target_link_libraries(analyzer ${QT_LIBRARIES} -lqmmp) +install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3aa9cdcc2..ee9f05439 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,106 +28,106 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../lib) link_directories(${CMAKE_INSTALL_PREFIX}/lib) SET(libsrc_SRCS - mainwindow.cpp - mp3player.cpp - fileloader.cpp + aboutdialog.cpp + addurldialog.cpp + balancebar.cpp button.cpp - display.cpp - skin.cpp - titlebar.cpp - positionbar.cpp - number.cpp - playlist.cpp - mediafile.cpp - listwidget.cpp - playlistmodel.cpp - pixmapwidget.cpp - playlisttitlebar.cpp configdialog.cpp - playlistslider.cpp + display.cpp dock.cpp - eqwidget.cpp - eqtitlebar.cpp - eqslider.cpp - togglebutton.cpp eqgraph.cpp - mainvisual.cpp - fft.c + eqpreset.cpp + eqslider.cpp + eqtitlebar.cpp + eqwidget.cpp + filedialog.cpp + fileloader.cpp + jumptotrackdialog.cpp + keyboardmanager.cpp + listwidget.cpp logscale.cpp - textscroller.cpp + mainvisual.cpp + mainwindow.cpp + mediafile.cpp monostereo.cpp + mp3player.cpp + number.cpp + pixmapwidget.cpp + playlistcontrol.cpp + playlist.cpp + playlistformat.cpp + playlistmodel.cpp + playlistslider.cpp + playlisttitlebar.cpp + playstate.cpp playstatus.cpp pluginitem.cpp - volumebar.cpp - balancebar.cpp - playstate.cpp - symboldisplay.cpp - playlistformat.cpp - playlistcontrol.cpp - qmmpstarter.cpp - tcpserver.cpp - guard.cpp - eqpreset.cpp + positionbar.cpp preseteditor.cpp - jumptotrackdialog.cpp - aboutdialog.cpp - timeindicator.cpp - keyboardmanager.cpp - addurldialog.cpp - filedialog.cpp + qmmpstarter.cpp + skin.cpp skinreader.cpp + symboldisplay.cpp + textscroller.cpp + timeindicator.cpp + titlebar.cpp + togglebutton.cpp + unixdomainsocket.cpp + visualmenu.cpp + volumebar.cpp + fft.c ) SET(libsrc_MOC_HDRS - mainwindow.h - fileloader.h + aboutdialog.h + addurldialog.h + balancebar.h button.h - display.h - skin.h - titlebar.h - positionbar.h - number.h - playlist.h - mediafile.h - listwidget.h - playlistmodel.h - pixmapwidget.h - playlisttitlebar.h configdialog.h - playlistslider.h + display.h dock.h - eqwidget.h - eqtitlebar.h - eqslider.h - togglebutton.h eqgraph.h - mainvisual.h - inlines.h + eqpreset.h + eqslider.h + eqtitlebar.h + eqwidget.h fft.h + filedialog.h + fileloader.h + inlines.h + jumptotrackdialog.h + keyboardmanager.h + listwidget.h logscale.h - textscroller.h + mainvisual.h + mainwindow.h + mediafile.h monostereo.h + number.h + pixmapwidget.h + playlistcontrol.h + playlistformat.h + playlist.h + playlistmodel.h + playlistslider.h + playlisttitlebar.h + playstate.h playstatus.h pluginitem.h - volumebar.h - balancebar.h - playstate.h - symboldisplay.h - playlistformat.h - playlistcontrol.h - version.h - tcpserver.h - qmmpstarter.h - guard.h - eqpreset.h + positionbar.h preseteditor.h - jumptotrackdialog.h - aboutdialog.h - timeindicator.h - keyboardmanager.h - addurldialog.h - filedialog.h + qmmpstarter.h + skin.h skinreader.h + symboldisplay.h + textscroller.h + timeindicator.h + titlebar.h + togglebutton.h + unixdomainsocket.h + version.h + visualmenu.h + volumebar.h ) SET(libsrc_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc) @@ -157,4 +157,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_EXECUTABLE(qmmp ${libsrc_SRCS} ${libsrc_MOC_SRCS} ${libsrc_UIS_H} ${libsrc_RCC_SRCS}) target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp) -install(TARGETS qmmp DESTINATION bin PERMISSIONS WORLD_EXECUTE OWNER_READ OWNER_WRITE) +install(TARGETS qmmp DESTINATION bin PERMISSIONS PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) |