diff --git a/README b/README index f9667a8..811acc8 100644 --- a/README +++ b/README @@ -3,32 +3,20 @@ Required dependencies: * XMMS2 http://xmms2.xmms.org/ * XMMS2 C++ bindings (make sure you have boost_signals when compiling xmms2) - promoe works with 0.4DrK and 0.5DrL + * Python for compiling Optional dependencys: * Avahi http://www.avahi.org/ Compiling: - 1) Run qmake in the topdir (not in ./src) - (on debian systems it's called qmake-qt4) - 2) Run make - 3) Have a coffe - 4) ./promoe - 5) ???? - 6) profit + 1) Run './waf configure' + 2) Run './waf build' + This can take some time + 3) Run './waf install' to install + 4) Have fun - To change the install directory, use 'qmake PREFIX=' at step 1 - -Compilation problems: - - Errormessage "WARNING: Found potential symbol conflict of " - -> make sure you use uic from Qt4 (uic -version) - (on debian systems it's sufficant if uic-qt4 exists) - - - Errormessage "error: xmmsclient/xmmsclient++.h: No such file or directory" - followed by a bunch of other errors - -> You don't have the xmms2-c++ header files installed - (package libxmmsclient++-dev on debian) - After installing the headerfiles run 'make distclean' and start again - from 'Compiling 1)' + To change the install directory, use + './waf configure --prefix=' at step 1 Reporting Bugs: preferred way to report bugs is through xmms2's bugtracker at diff --git a/config.pri b/config.pri deleted file mode 100644 index 94a3b69..0000000 --- a/config.pri +++ /dev/null @@ -1,11 +0,0 @@ -DEFINES += PROMOE_VERSION="\"\\\"0.1.0\\\"\"" - -isEmpty(PREFIX): PREFIX = /usr/local -isEmpty(BINDIR): BINDIR = $$PREFIX/bin -isEmpty(DATADIR): DATADIR = $$PREFIX/share/promoe -isEmpty(MANDIR): MANDIR = $$PREFIX/share/man - -DEFINES += DATADIR="\"\\\"$$DATADIR\\\"\"" - -DEPENDPATH += $PWD/src $PWD/lib -INCLUDEPATH += $$PWD/src $$PWD/lib diff --git a/features/pkgconfig.prf b/features/pkgconfig.prf deleted file mode 100644 index 55a0f48..0000000 --- a/features/pkgconfig.prf +++ /dev/null @@ -1,10 +0,0 @@ -# This file is intended replacement for Qt's link_pkgconfig -for(PACKAGE, $$list($$unique(PKGCONFIG))) { - system(pkg-config --exists $$PACKAGE) { - CONFIG += $$PACKAGE - } -} - -QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG) -QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG) -LIBS += $$system(pkg-config --libs $$PKGCONFIG) diff --git a/lib/lib.pro b/lib/lib.pro deleted file mode 100644 index 087321c..0000000 --- a/lib/lib.pro +++ /dev/null @@ -1,38 +0,0 @@ -TEMPLATE = lib -CONFIG += static -include (../config.pri) - -PKGCONFIG += xmms2-client-cpp -load (../features/pkgconfig.prf) - -!xmms2-client-cpp:error (Please install the xmms2 c++ client library) - -MOC_DIR = .moc -OBJECTS_DIR = .obj - -SOURCES += xclient.cpp \ - xclientcache.cpp \ - xconfig.cpp \ - xplayback.cpp \ - xcollection.cpp \ - playlistmodel.cpp \ - xmmsqt4.cpp - - -HEADERS += xclient.h \ - xclientcache.h \ - xconfig.h \ - xplayback.h \ - xcollection.h \ - xcollection_p.h \ - playlistmodel.h \ - xmmsqt4.h \ - sourcepref.h \ - compat.h \ - debug.h - -QT += network -QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats - -QMAKE_CXXFLAGS += -g -QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter diff --git a/promoe.pro b/promoe.pro deleted file mode 100644 index 0d3a609..0000000 --- a/promoe.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = lib src - -include (config.pri) - -message ( "Install prefix set to:" $$PREFIX ) - -binary.path = $$BINDIR -binary.files = promoe - -INSTALLS += binary - -unix: { -manpages1.path = $$MANDIR/man1 -manpages1.files = promoe.1 -INSTALLS += manpages1 -desktop.path = $$PREFIX/share/applications -desktop.files = promoe.desktop -INSTALLS += desktop -} - diff --git a/src/dialogs/dialogs.pri b/src/dialogs/dialogs.pri deleted file mode 100644 index e1a033c..0000000 --- a/src/dialogs/dialogs.pri +++ /dev/null @@ -1,14 +0,0 @@ -HEADERS += entryinfo.h \ - playlistchooser.h \ - urlopen.h - -SOURCES += entryinfo.cpp \ - playlistchooser.cpp \ - urlopen.cpp - -FORMS += entryinfo.ui \ - playlistchooser.ui \ - urlopen.ui - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/src/equalizer/equalizer.pri b/src/equalizer/equalizer.pri deleted file mode 100644 index c69e850..0000000 --- a/src/equalizer/equalizer.pri +++ /dev/null @@ -1,8 +0,0 @@ -HEADERS += equalizerwindow.h \ - equalizerwidget.h - -SOURCES += equalizerwindow.cpp \ - equalizerwidget.cpp - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/src/mainwindow/mainwindow.pri b/src/mainwindow/mainwindow.pri deleted file mode 100644 index 6c0a11f..0000000 --- a/src/mainwindow/mainwindow.pri +++ /dev/null @@ -1,24 +0,0 @@ -HEADERS += clutterbar.h \ - mainwindow.h \ - maindisplay.h \ - playstatus.h \ - posbar.h \ - shadeddisplay.h \ - skindisplay.h \ - stereomono.h \ - textscroller.h \ - titlebar.h - -SOURCES += clutterbar.cpp \ - mainwindow.cpp \ - maindisplay.cpp \ - playstatus.cpp \ - posbar.cpp \ - shadeddisplay.cpp \ - skindisplay.cpp \ - stereomono.cpp \ - textscroller.cpp \ - titlebar.cpp - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/src/playlist/playlist.pri b/src/playlist/playlist.pri deleted file mode 100644 index 0c519de..0000000 --- a/src/playlist/playlist.pri +++ /dev/null @@ -1,16 +0,0 @@ -HEADERS += playlistwindow.h \ - playlistwidget.h \ - playlistcontrols.h \ - playlistmenu.h \ - playlistshade.h \ - playlistview.h - -SOURCES += playlistwindow.cpp \ - playlistwidget.cpp \ - playlistcontrols.cpp \ - playlistmenu.cpp \ - playlistshade.cpp \ - playlistview.cpp - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/src/src.pri b/src/src.pri deleted file mode 100644 index 17569dc..0000000 --- a/src/src.pri +++ /dev/null @@ -1,28 +0,0 @@ -include($$PWD/widgets/widgets.pri) -include($$PWD/mainwindow/mainwindow.pri) -include($$PWD/playlist/playlist.pri) -include($$PWD/equalizer/equalizer.pri) -include($$PWD/dialogs/dialogs.pri) - -HEADERS += application.h \ - Skin.h \ - timedisplay.h \ - SkinChooser.h \ - settingsdialog.h \ - basewindow.h \ - FileDialog.h \ - BrowseModel.h \ - BrowseDialog.h - -SOURCES += application.cpp \ - timedisplay.cpp \ - Skin.cpp \ - SkinChooser.cpp \ - settingsdialog.cpp \ - basewindow.cpp \ - FileDialog.cpp \ - BrowseModel.cpp \ - BrowseDialog.cpp - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 7089302..0000000 --- a/src/src.pro +++ /dev/null @@ -1,36 +0,0 @@ -TEMPLATE = app - -include (../config.pri) -PKGCONFIG += xmms2-client-cpp -load (../features/pkgconfig.prf) - -!xmms2-client-cpp:error (Please install the xmms2 c++ client library) - -COMPONENTS+=../lib/liblib.a -LIBS += $$COMPONENTS -PRE_TARGETDEPS = $$COMPONENTS - -MOC_DIR = .moc -OBJECTS_DIR = .obj -UI_DIR = .ui - -include(src.pri) - -TARGET = promoe -DESTDIR = $$PWD/.. - -;RESOURCES += ../data/promoe.qrc -RESOURCES += ../data/Almond-blue.qrc -;macx:RC_FILE = ../promoe.icns - -QT += network -;macx:QTPLUGIN += qjpeg -QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats - - -QMAKE_CXXFLAGS += -g -;CONFIG += debug warn_on -QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter - -;CONFIG += avahi - diff --git a/src/widgets/widgets.pri b/src/widgets/widgets.pri deleted file mode 100644 index 7e83c4a..0000000 --- a/src/widgets/widgets.pri +++ /dev/null @@ -1,10 +0,0 @@ -HEADERS += pixmapbutton.h \ - pixmapnumberdisplay.h \ - pixmapslider.h - -SOURCES += pixmapbutton.cpp \ - pixmapnumberdisplay.cpp \ - pixmapslider.cpp - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD