author | mickeyl <mickeyl> | 2004-04-07 09:22:10 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-07 09:22:10 (UTC) |
commit | 837069ed5f048c99774c88f2ad05a057a0b76ce8 (patch) (unidiff) | |
tree | 24b5ecfd4c32d83ac6d2e56f6d3588408693759b | |
parent | c0dd8590826677ab9a0328873062882f0d026ea7 (diff) | |
download | opie-837069ed5f048c99774c88f2ad05a057a0b76ce8.zip opie-837069ed5f048c99774c88f2ad05a057a0b76ce8.tar.gz opie-837069ed5f048c99774c88f2ad05a057a0b76ce8.tar.bz2 |
simplify mac os test
-rw-r--r-- | core/launcher/server.pro | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 053bb77..25806b6 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro | |||
@@ -111,22 +111,18 @@ SOURCES += server.cpp \ | |||
111 | 111 | ||
112 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate | 112 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate |
113 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate | 113 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate |
114 | 114 | ||
115 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync | 115 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync |
116 | DEPENDPATH+= $(OPIEDIR)/rsync | 116 | DEPENDPATH+= $(OPIEDIR)/rsync |
117 | 117 | ||
118 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount | 118 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount |
119 | DEPENDPATH+= $(OPIEDIR)/noncore/settings/mediummount | 119 | DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount |
120 | 120 | ||
121 | LIBS += -lqpe -lopiecore2 -lopieui2 | ||
122 | TARGET = qpe | ||
121 | 123 | ||
122 | TARGET = qpe | 124 | contains( $(CONFIG_TARGET_MACOSX), y ) { |
123 | 125 | LIBS += -lcrypt | |
124 | #needs OWait and ODevice | ||
125 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | ||
126 | contains( CONFTEST, y ){ | ||
127 | LIBS += -lqpe -lopiecore2 -lopieui2 | ||
128 | }else{ | ||
129 | LIBS+= -lcrypt -lqpe -lopiecore2 -lopieui2 | ||
130 | } | 126 | } |
131 | 127 | ||
132 | include ( $(OPIEDIR)/include.pro ) | 128 | include ( $(OPIEDIR)/include.pro ) |