summaryrefslogtreecommitdiff
authoreilers <eilers>2004-07-29 11:02:34 (UTC)
committer eilers <eilers>2004-07-29 11:02:34 (UTC)
commit7d9a3eb895dca8e3e05013c602b84bdca1cc28d1 (patch) (unidiff)
tree5ff65f1863adc136c54bf1294059c6dca4f7f7c9
parent9acd0749bf34844ed023e6145b78d7c5958ccaef (diff)
downloadopie-7d9a3eb895dca8e3e05013c602b84bdca1cc28d1.zip
opie-7d9a3eb895dca8e3e05013c602b84bdca1cc28d1.tar.gz
opie-7d9a3eb895dca8e3e05013c602b84bdca1cc28d1.tar.bz2
MacOS specific changes.
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 01e4f3c..0dc941b 100644
--- a/include.pro
+++ b/include.pro
@@ -68,63 +68,64 @@ INSTALLS += apps
68 68
69# sounds, default path is $$prefix/sounds/$$TARGET 69# sounds, default path is $$prefix/sounds/$$TARGET
70sounds.path = $$prefix/sounds/$$TARGET 70sounds.path = $$prefix/sounds/$$TARGET
71sounds.files = sounds/* 71sounds.files = sounds/*
72INSTALLS += sounds 72INSTALLS += sounds
73 73
74# anything in nonstandard paths 74# anything in nonstandard paths
75root.path = / 75root.path = /
76root.files = root/* 76root.files = root/*
77INSTALLS += root 77INSTALLS += root
78 78
79# new targets 79# new targets
80opie-lupdate.target = opie-lupdate 80opie-lupdate.target = opie-lupdate
81opie-lupdate.commands = opie-lupdate $(PRO) 81opie-lupdate.commands = opie-lupdate $(PRO)
82 82
83opie-lrelease.target = opie-lrelease 83opie-lrelease.target = opie-lrelease
84opie-lrelease.commands = opie-lrelease $(PRO) 84opie-lrelease.commands = opie-lrelease $(PRO)
85 85
86lupdate.target = lupdate 86lupdate.target = lupdate
87lupdate.commands = lupdate -noobsolete $(PRO) 87lupdate.commands = lupdate -noobsolete $(PRO)
88 88
89lrelease.target = lrelease 89lrelease.target = lrelease
90lrelease.commands = lrelease $(PRO) 90lrelease.commands = lrelease $(PRO)
91 91
92# new message target to get all strings from the apps with and without tr 92# new message target to get all strings from the apps with and without tr
93messages.target = messages 93messages.target = messages
94messages.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' 94messages.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'
95 95
96ipk.target = ipk 96ipk.target = ipk
97ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 97ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
98 98
99QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages 99QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
100 100
101CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) 101CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
102contains( CONFTEST, y ){ 102contains( CONFTEST, y ){
103 QMAKE_LFLAGS += -Wl 103 QMAKE_LFLAGS += -Wl
104 LIBS -= -ldl 104 LIBS -= -ldl
105 LIBS -= -lcrypt 105 LIBS -= -lcrypt
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 LIBS += -lopiecore2
116} 117}
117else { 118else {
118 119
119QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib 120QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib
120# I am not sure whether it is a good idea to change the way plugins is build 121# I am not sure whether it is a good idea to change the way plugins is build
121# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X 122# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
122CONFIG -= plugin 123CONFIG -= plugin
123} 124}
124LIBS += -L$(OPIEDIR)/lib 125LIBS += -L$(OPIEDIR)/lib
125 126
126MOC_DIR=.moc/$(PLATFORM) 127MOC_DIR=.moc/$(PLATFORM)
127OBJECTS_DIR=.obj/$(PLATFORM) 128OBJECTS_DIR=.obj/$(PLATFORM)
128 129
129#was here now at thetop 130#was here now at thetop
130#include ( $(OPIEDIR)/gen.pro ) 131#include ( $(OPIEDIR)/gen.pro )