From c817abf3b81ca47927433ede1efd9afddfc15a72 Mon Sep 17 00:00:00 2001 From: tille Date: Mon, 25 Aug 2003 12:56:53 +0000 Subject: libopie2 compiles for qt3/x11 now run: qmake "platform=x11" libopie2.pro --- (limited to 'libopie2') diff --git a/libopie2/README b/libopie2/README index 57172a7..daf6b27 100644 --- a/libopie2/README +++ b/libopie2/README @@ -11,6 +11,25 @@ * reduce possible bugs through reusing tested code -------------------------------------------------------- +0. Building +-------------------------------------------------------- + +* for QPE run: + qmake libopie2.pro + make + +OR (even better) + cd $OPIEDIR + make menuconfig + make -k + +* for QT/X11 run: + qmake "platform=x11" libopie2.pro + make + +Make sure you have set $PLATFORM=x86-linux + +-------------------------------------------------------- 1. General Overview -------------------------------------------------------- diff --git a/libopie2/libopie2.pro b/libopie2/libopie2.pro index 0bd1d06..e734654 100644 --- a/libopie2/libopie2.pro +++ b/libopie2/libopie2.pro @@ -1,4 +1,11 @@ TEMPLATE = subdirs unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm examples -include ( $(OPIEDIR)/include.pro ) +!contains( platform, x11 ) { + message( Configuring libopie2 for build on Opie ) + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + message( Configuring libopie2 for build on Qt/X11 ) +} diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index 06d8ba2..84cab48 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -53,7 +54,11 @@ class OApplicationPrivate OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) +#ifdef QWS :QPEApplication( argc, argv ), +#else + :QApplication( argc, argv ), +#endif _appname( rAppName ), _config( 0 ) { @@ -107,7 +112,14 @@ void OApplication::init() void OApplication::showMainWidget( QWidget* widget, bool nomax ) { +#ifdef QWS QPEApplication::showMainWidget( widget, nomax ); +#else +// tille: I am quit sure if this is the right way to do.. + odDebug(nomax,7) << "ignoring nomax"; + setMainWidget( widget ); + widget->show(); +#endif widget->setCaption( _appname ); } diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 6bc2b1c..3043910 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -33,12 +33,20 @@ #define oApp OApplication::oApplication() +#ifdef QWS #include +#else +#include +#endif class OApplicationPrivate; class OConfig; -class OApplication: public QPEApplication +#ifdef QWS +class OApplication : public QPEApplication +#else +class OApplication : public QApplication +#endif { Q_OBJECT diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index ed7d6d7..c8a291a 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro @@ -23,9 +23,16 @@ TARGET = opiecore2 VERSION = 1.8.1 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS = -lqpe MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) + +!contains( platform, x11 ) { + LIBS = -lqpe + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index 401646a..3612f0e 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro @@ -28,5 +28,11 @@ DEPENDPATH += $(OPIEDIR)/include MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiedb/osqlmanager.h b/libopie2/opiedb/osqlmanager.h index b3d8d69..5323b14 100644 --- a/libopie2/opiedb/osqlmanager.h +++ b/libopie2/opiedb/osqlmanager.h @@ -3,9 +3,11 @@ #define OSQL_MANAGER_H #include +#include #include "osqlbackend.h" + /** * OSQLManager is responsible for loading * and unloading, querying different OSQL diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index 8e5eeb4..d3ce8f7 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro @@ -12,5 +12,11 @@ LIBS += MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index fd23bea..d857659 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp @@ -39,6 +39,7 @@ #include #include +#include /*====================================================================================== * OSoundSystem diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro index 3f9166a..93389db 100644 --- a/libopie2/opienet/opienet.pro +++ b/libopie2/opienet/opienet.pro @@ -18,5 +18,11 @@ LIBS += -lpcap MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index 7fc7bb7..cc6ee90 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro @@ -13,5 +13,12 @@ DEPENDPATH += $(OPIEDIR)/include MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) + +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index aa85955..1b6ecdf 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -15,8 +15,8 @@ HEADERS = ocompletionbox.h \ oversatileviewitem.h \ #ojanuswidget.h \ odialog.h \ - oseparator.h \ - otaskbarapplet.h + oseparator.h +# otaskbarapplet.h SOURCES = ocompletionbox.cpp \ ocombobox.cpp \ @@ -32,8 +32,8 @@ SOURCES = ocompletionbox.cpp \ oversatileviewitem.cpp \ #ojanuswidget.cpp \ odialog.cpp \ - oseparator.cpp \ - otaskbarapplet.cpp + oseparator.cpp #\ +# otaskbarapplet.cpp INTERFACES = TARGET = opieui2 @@ -44,5 +44,15 @@ LIBS += -lopiecore2 MOC_DIR = moc OBJECTS_DIR = obj -include ( $(OPIEDIR)/include.pro ) + +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) + HEADERS += otaskbarapplet.h + SOURCES += otaskbarapplet.cpp +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + message( Warning: NO otaskbarapplet ATM ) +} diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h index 1df8154..8af21dc 100644 --- a/libopie2/opieui/oversatileview.h +++ b/libopie2/opieui/oversatileview.h @@ -38,7 +38,7 @@ /* OPIE */ -#include +#include /* FORWARDS */ -- cgit v0.9.0.2