summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-07 09:22:10 (UTC)
committer mickeyl <mickeyl>2004-04-07 09:22:10 (UTC)
commit837069ed5f048c99774c88f2ad05a057a0b76ce8 (patch) (side-by-side diff)
tree24b5ecfd4c32d83ac6d2e56f6d3588408693759b
parentc0dd8590826677ab9a0328873062882f0d026ea7 (diff)
downloadopie-837069ed5f048c99774c88f2ad05a057a0b76ce8.zip
opie-837069ed5f048c99774c88f2ad05a057a0b76ce8.tar.gz
opie-837069ed5f048c99774c88f2ad05a057a0b76ce8.tar.bz2
simplify mac os test
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/server.pro14
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
@@ -115,18 +115,14 @@ DEPENDPATH += $(OPIEDIR)/core/apps/calibrate
INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
DEPENDPATH += $(OPIEDIR)/rsync
INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
-DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
+DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
+LIBS += -lqpe -lopiecore2 -lopieui2
+TARGET = qpe
-TARGET = qpe
-
-#needs OWait and ODevice
-CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
-contains( CONFTEST, y ){
- LIBS += -lqpe -lopiecore2 -lopieui2
-}else{
- LIBS += -lcrypt -lqpe -lopiecore2 -lopieui2
+contains( $(CONFIG_TARGET_MACOSX), y ) {
+ LIBS += -lcrypt
}
include ( $(OPIEDIR)/include.pro )