| author | wimpie <wimpie> | 2004-04-02 18:39:22 (UTC) |
|---|---|---|
| committer | wimpie <wimpie> | 2004-04-02 18:39:22 (UTC) |
| commit | 4dc16eb2ba783d4f19e2c8c20ce0c128d715c440 (patch) (side-by-side diff) | |
| tree | ebe3a8f929251f9cbdabd3523879096fb83c1f2a | |
| parent | 38f1377597f88d7bb381b750df53754d0f5b2924 (diff) | |
| download | opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.zip opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.gz opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.bz2 | |
changed QMAKE flag for non-quicklaunch build from -rpath to -rpath-link
| -rw-r--r-- | include.pro | 1 |
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 @@ -94,36 +94,37 @@ messages.target = messages messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' ipk.target = ipk ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) contains( CONFTEST, y ){ QMAKE_LFLAGS += -Wl LIBS -= -ldl LIBS -= -lcrypt LIBS -= -lm # Manual including indirect referenced libraries which are not loaded # by the mac-linker automatically CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) contains( CONFTEST, y ){ LIBS += -lopiedb2 -lqpe } else { LIBS += -lqpe } } else { + QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib # I am not sure whether it is a good idea to change the way plugins is build # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X CONFIG -= plugin } LIBS += -L$(OPIEDIR)/lib MOC_DIR=.moc/$(PLATFORM) OBJECTS_DIR=.obj/$(PLATFORM) #was here now at thetop #include ( $(OPIEDIR)/gen.pro ) |