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
@@ -3,2 +3,10 @@ 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
@@ -12,3 +12,9 @@ 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
@@ -9,5 +9,11 @@ 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
@@ -12,4 +12,12 @@ 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 
+}
+