| author | drw <drw> | 2004-03-02 15:53:09 (UTC) |
|---|---|---|
| committer | drw <drw> | 2004-03-02 15:53:09 (UTC) |
| commit | 1e88bf8b55fa51d9b7989930f29f404e5ec50bc1 (patch) (side-by-side diff) | |
| tree | ebabdb360606426dfa02df6b32acbf9b5f27977f | |
| parent | 270a76fbf653df353476ddf17835d532ceb6b6c2 (diff) | |
| download | opie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.zip opie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.tar.gz opie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.tar.bz2 | |
OpieRec: libopie -> libopie2
| -rw-r--r-- | noncore/multimedia/opierec/config.in | 2 | ||||
| -rw-r--r-- | noncore/multimedia/opierec/main.cpp | 4 | ||||
| -rw-r--r-- | noncore/multimedia/opierec/opierec.control | 2 | ||||
| -rw-r--r-- | noncore/multimedia/opierec/opierec.pro | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/noncore/multimedia/opierec/config.in b/noncore/multimedia/opierec/config.in index fe195bc..36a87c9 100644 --- a/noncore/multimedia/opierec/config.in +++ b/noncore/multimedia/opierec/config.in @@ -1,4 +1,4 @@ config OPIEREC boolean "opie-rec (simple audio recording/playing app)" default "n" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp index 74a175b..bb51446 100644 --- a/noncore/multimedia/opierec/main.cpp +++ b/noncore/multimedia/opierec/main.cpp @@ -21,7 +21,9 @@ int main(int argc, char* argv[]) { #else -#include <opie/oapplicationfactory.h> + +#include <opie2/oapplicationfactory.h> + OPIE_EXPORT_APP( OApplicationFactory<QtRec> ) #endif diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control index eb7e5d1..5ac3513 100644 --- a/noncore/multimedia/opierec/opierec.control +++ b/noncore/multimedia/opierec/opierec.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/multimedia Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: audio sampling recorder A simple audio recording/playing application. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro index 8b06edb..6393252 100644 --- a/noncore/multimedia/opierec/opierec.pro +++ b/noncore/multimedia/opierec/opierec.pro @@ -19,10 +19,10 @@ INTERFACES = contains(CONFIG, pdaudio) { # LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz - LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz + LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2 INCLUDEPATH += $(QPEDIR)/include DEPENDPATH += $(QPEDIR)/include - DEFINES += PDAUDIO + DEFINES += PDAUDIO DEFINES += THREADED TARGET = qperec @@ -33,7 +33,7 @@ contains(CONFIG, opie) { INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include DESTDIR=$(OPIEDIR)/bin - LIBS += -lqpe -lpthread + LIBS += -lqpe -lopiecore2 -lpthread TARGET = opierec include ( $(OPIEDIR)/include.pro ) } |