-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 @@ | |||
1 | TEMPLATE = subdirs | 1 | TEMPLATE = subdirs |
2 | unix:SUBDIRS = opieui opienet opiecore opiemm opiedb | 2 | unix:SUBDIRS = opieui opienet opiecore opiemm opiedb |
3 | 3 | ||
4 | #include ( ../../../include.pro ) | 4 | |
5 | !contains( platform, x11 ) { | ||
6 | include ( $(OPIEDIR)/include.pro ) | ||
7 | } | ||
8 | |||
9 | contains( platform, x11 ) { | ||
10 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
11 | } | ||
12 | |||
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 | |||
@@ -9,6 +9,12 @@ LIBS += -lopiecore2 | |||
9 | TARGET = oconfigdemo | 9 | TARGET = oconfigdemo |
10 | MOC_DIR = moc | 10 | MOC_DIR = moc |
11 | OBJECTS_DIR = obj | 11 | OBJECTS_DIR = obj |
12 | 12 | ||
13 | include ( $(OPIEDIR)/include.pro ) | 13 | !contains( platform, x11 ) { |
14 | include ( $(OPIEDIR)/include.pro ) | ||
15 | } | ||
16 | |||
17 | contains( platform, x11 ) { | ||
18 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
19 | } | ||
14 | 20 | ||
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 | |||
@@ -6,8 +6,14 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lopiecore2 | 7 | LIBS += -lopiecore2 |
8 | TARGET = odebugdemo | 8 | TARGET = odebugdemo |
9 | 9 | ||
10 | include ( $(OPIEDIR)/include.pro ) | ||
11 | |||
12 | MOC_DIR = moc | 10 | MOC_DIR = moc |
13 | OBJECTS_DIR = obj | 11 | OBJECTS_DIR = obj |
12 | |||
13 | !contains( platform, x11 ) { | ||
14 | include ( $(OPIEDIR)/include.pro ) | ||
15 | } | ||
16 | |||
17 | contains( platform, x11 ) { | ||
18 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
19 | } | ||
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 | |||
@@ -9,7 +9,15 @@ LIBS += -lopieui2 -lopiecore2 | |||
9 | TARGET = olistviewdemo | 9 | TARGET = olistviewdemo |
10 | MOC_DIR = moc | 10 | MOC_DIR = moc |
11 | OBJECTS_DIR = obj | 11 | OBJECTS_DIR = obj |
12 | 12 | ||
13 | include ( $(OPIEDIR)/include.pro ) | ||
14 | 13 | ||
15 | 14 | ||
15 | |||
16 | !contains( platform, x11 ) { | ||
17 | include ( $(OPIEDIR)/include.pro ) | ||
18 | } | ||
19 | |||
20 | contains( platform, x11 ) { | ||
21 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
22 | } | ||
23 | |||