-rw-r--r-- | include.pro | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include.pro b/include.pro index 70ed731..4bdcaa7 100644 --- a/include.pro +++ b/include.pro | |||
@@ -1,7 +1,8 @@ | |||
1 | include ( $(OPIEDIR)/gen.pro ) | 1 | include ( $(OPIEDIR)/gen.pro ) |
2 | 2 | ||
3 | # base opie install path | 3 | # base opie install path |
4 | prefix = /opt/QtPalmtop | 4 | # prefix = /opt/QtPalmtop ??? Why here (eilers) ??? |
5 | prefix = $(OPIEDIR) | ||
5 | 6 | ||
6 | contains( CONFIG, quick-app-lib ) { | 7 | contains( CONFIG, quick-app-lib ) { |
7 | TEMPLATE = lib | 8 | TEMPLATE = lib |
@@ -95,7 +96,16 @@ ipk.target = ipk | |||
95 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 96 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
96 | 97 | ||
97 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages | 98 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages |
99 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | ||
100 | contains( CONFTEST, y ){ | ||
101 | QMAKE_LFLAGS += -Wl | ||
102 | } | ||
103 | else { | ||
98 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 104 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
105 | # I am not sure whether it is a good idea to change the way plugins is build | ||
106 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | ||
107 | CONFIG -= plugin | ||
108 | } | ||
99 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 109 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
100 | 110 | ||
101 | MOC_DIR=.moc/$(PLATFORM) | 111 | MOC_DIR=.moc/$(PLATFORM) |