| author | tille <tille> | 2003-09-02 15:38:07 (UTC) |
|---|---|---|
| committer | tille <tille> | 2003-09-02 15:38:07 (UTC) |
| commit | e87caebc920ad256d210eeb31aeb134318f0c104 (patch) (side-by-side diff) | |
| tree | 2776167f9277b41cb03d4afbb5626ccb6a88b8ea /libopie2/examples | |
| parent | aa1be5c49b77368999f068222f5f4e1f0d1ace0d (diff) | |
| download | opie-e87caebc920ad256d210eeb31aeb134318f0c104.zip opie-e87caebc920ad256d210eeb31aeb134318f0c104.tar.gz opie-e87caebc920ad256d210eeb31aeb134318f0c104.tar.bz2 | |
this should make oapplication compile (and run) for qt3/x11
| -rw-r--r-- | libopie2/examples/examples.pro | 10 | ||||
| -rw-r--r-- | libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro | 8 | ||||
| -rw-r--r-- | libopie2/examples/opiecore/odebugdemo/odebugdemo.pro | 10 | ||||
| -rw-r--r-- | libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro | 10 |
4 files changed, 33 insertions, 5 deletions
diff --git a/libopie2/examples/examples.pro b/libopie2/examples/examples.pro index c1ed98e..b2d47b0 100644 --- a/libopie2/examples/examples.pro +++ b/libopie2/examples/examples.pro @@ -1,4 +1,12 @@ TEMPLATE = subdirs unix:SUBDIRS = opieui opienet opiecore opiemm opiedb -#include ( ../../../include.pro ) + +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} + diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro index 0109c57..9b59106 100644 --- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro +++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro @@ -1,14 +1,20 @@ TEMPLATE = app CONFIG = qt warn_on debug HEADERS = SOURCES = oconfigdemo.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 TARGET = oconfigdemo 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/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro index 4cd815f..c52cd02 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro @@ -1,13 +1,19 @@ TEMPLATE = app CONFIG = qt warn_on debug HEADERS = SOURCES = odebugdemo.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 TARGET = odebugdemo -include ( $(OPIEDIR)/include.pro ) - MOC_DIR = moc OBJECTS_DIR = obj + +!contains( platform, x11 ) { + include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro index aabe733..99eb41a 100644 --- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro +++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.pro @@ -1,15 +1,23 @@ TEMPLATE = app CONFIG = qt warn_on debug HEADERS = olistviewdemo.h SOURCES = olistviewdemo.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopieui2 -lopiecore2 TARGET = olistviewdemo 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 +} + |