fixed cmake scripts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2256 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 5 insertions, 126 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 471e26443..cf1353f63 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -28,153 +28,32 @@ link_directories(${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
 
-# X11
-include_directories(${X11_INCLUDE_DIRS})
-link_directories(${X11_LIBRARY_DIRS})
-
 SET(ui_SRCS
-    fft.c
-    aboutdialog.cpp
-    addurldialog.cpp
-    balancebar.cpp
-    button.cpp
     builtincommandlineoption.cpp
-    configdialog.cpp
-    display.cpp
-    dock.cpp
-    eqgraph.cpp
-    eqpreset.cpp
-    eqslider.cpp
-    eqtitlebar.cpp
-    eqwidget.cpp
-    jumptotrackdialog.cpp
-    keyboardmanager.cpp
-    listwidget.cpp
-    mainvisual.cpp
-    mainwindow.cpp
-    monostereo.cpp
-    mp3player.cpp
-    number.cpp
-    pixmapwidget.cpp
-    playlistcontrol.cpp
-    playlist.cpp
-    playlistslider.cpp
-    playlisttitlebar.cpp
-    playstatus.cpp
-    pluginitem.cpp
-    positionbar.cpp
-    preseteditor.cpp
+    main.cpp
     qmmpstarter.cpp
-    shadedbar.cpp
-    shadedvisual.cpp
-    skin.cpp
-    skinreader.cpp
-    symboldisplay.cpp
-    textscroller.cpp
-    timeindicator.cpp
-    titlebarcontrol.cpp
-    titlebar.cpp
-    togglebutton.cpp
-    visualmenu.cpp
-    volumebar.cpp
-    cursorimage.cpp
-    playlistbrowser.cpp
-    playlistselector.cpp
-    popupwidget.cpp
-    popupsettings.cpp
-    windowsystem.cpp
     lxdesupport.cpp
-    actionmanager.cpp
-    shortcutitem.cpp
-    shortcutdialog.cpp
 )
 
 SET(ui_MOC_HDRS
-    aboutdialog.h
-    addurldialog.h
-    balancebar.h
-    button.h
     builtincommandlineoption.h
-    configdialog.h
-    display.h
-    dock.h
-    eqgraph.h
-    eqpreset.h
-    eqslider.h
-    eqtitlebar.h
-    eqwidget.h
-    fft.h
-    inlines.h
-    jumptotrackdialog.h
-    keyboardmanager.h
-    listwidget.h
-    mainvisual.h
-    mainwindow.h
-    monostereo.h
-    number.h
-    pixmapwidget.h
-    playlistcontrol.h
-    playlist.h
-    playlistslider.h
-    playlisttitlebar.h
-    playstatus.h
-    pluginitem.h
-    positionbar.h
-    preseteditor.h
     qmmpstarter.h
-    shadedbar.h
-    shadedvisual.h
-    skin.h
-    skinreader.h
-    symboldisplay.h
-    textscroller.h
-    timeindicator.h
-    titlebarcontrol.h
-    titlebar.h
-    togglebutton.h
-    visualmenu.h
-    volumebar.h
-    cursorimage.h
-    playlistbrowser.h
-    playlistselector.h
-    popupwidget.h
-    popupsettings.h
-    windowsystem.h
-    lxdesupport.h
-    shortcutitem.h
-    actionmanager.h
-    shortcutdialog.h
+    lxdesupport.h    
 )
 
-SET(ui_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc)
+SET(ui_RCCS images/images.qrc translations/qmmp_locales.qrc)
 
 QT4_ADD_RESOURCES(ui_RCC_SRCS ${ui_RCCS})
 
 QT4_AUTOMOC(${ui_MOC_SRC})
 QT4_WRAP_CPP(ui_MOC_SRCS ${ui_MOC_HDRS})
 
-# user interface
-
-
-SET(ui_UIS
-    forms/aboutdialog.ui
-    forms/addurldialog.ui
-    forms/configdialog.ui
-    forms/jumptotrackdialog.ui
-    forms/preseteditor.ui
-    forms/playlistbrowser.ui
-    forms/popupsettings.ui
-    forms/shortcutdialog.ui
-)
-
-QT4_WRAP_UI(ui_UIS_H ${ui_UIS})
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H}
-  ${ui_RCC_SRCS})
-target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS})
+ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_RCC_SRCS})
+target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui)
 add_dependencies(qmmp qmmpui libqmmp)
 install(TARGETS qmmp DESTINATION bin)
 install(FILES qmmp.desktop DESTINATION share/applications)