summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-04-02 18:39:22 (UTC)
committer wimpie <wimpie>2004-04-02 18:39:22 (UTC)
commit4dc16eb2ba783d4f19e2c8c20ce0c128d715c440 (patch) (unidiff)
treeebe3a8f929251f9cbdabd3523879096fb83c1f2a
parent38f1377597f88d7bb381b750df53754d0f5b2924 (diff)
downloadopie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.zip
opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.gz
opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.bz2
changed QMAKE flag for non-quicklaunch build from -rpath to -rpath-link
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/include.pro b/include.pro
index 203f6c3..01e4f3c 100644
--- a/include.pro
+++ b/include.pro
@@ -106,24 +106,25 @@ contains( CONFTEST, y ){
106 LIBS -= -lm 106 LIBS -= -lm
107 107
108 # Manual including indirect referenced libraries which are not loaded 108 # Manual including indirect referenced libraries which are not loaded
109 # by the mac-linker automatically 109 # by the mac-linker automatically
110 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) 110 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
111 contains( CONFTEST, y ){ 111 contains( CONFTEST, y ){
112 LIBS += -lopiedb2 -lqpe 112 LIBS += -lopiedb2 -lqpe
113 } else { 113 } else {
114 LIBS += -lqpe 114 LIBS += -lqpe
115 } 115 }
116} 116}
117else { 117else {
118
118QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib 119QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib
119# I am not sure whether it is a good idea to change the way plugins is build 120# I am not sure whether it is a good idea to change the way plugins is build
120# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X 121# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
121CONFIG -= plugin 122CONFIG -= plugin
122} 123}
123LIBS += -L$(OPIEDIR)/lib 124LIBS += -L$(OPIEDIR)/lib
124 125
125MOC_DIR=.moc/$(PLATFORM) 126MOC_DIR=.moc/$(PLATFORM)
126OBJECTS_DIR=.obj/$(PLATFORM) 127OBJECTS_DIR=.obj/$(PLATFORM)
127 128
128#was here now at thetop 129#was here now at thetop
129#include ( $(OPIEDIR)/gen.pro ) 130#include ( $(OPIEDIR)/gen.pro )