summaryrefslogtreecommitdiff
authoreilers <eilers>2004-12-20 15:59:53 (UTC)
committer eilers <eilers>2004-12-20 15:59:53 (UTC)
commit3877c5de73003ca03888a35c7f6905b65f3ba602 (patch) (unidiff)
treeffe069af189792c6ce85d970f04098ce319ef527
parent5e6703a05b5655fc5f6df3802813ab89cbef689f (diff)
downloadopie-3877c5de73003ca03888a35c7f6905b65f3ba602.zip
opie-3877c5de73003ca03888a35c7f6905b65f3ba602.tar.gz
opie-3877c5de73003ca03888a35c7f6905b65f3ba602.tar.bz2
some mac updates to the current version
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/include.pro b/include.pro
index ffdba16..4815f19 100644
--- a/include.pro
+++ b/include.pro
@@ -89,46 +89,48 @@ opie-lrelease.commands = opie-lrelease $(PRO)
89lupdate.target = lupdate 89lupdate.target = lupdate
90lupdate.commands = lupdate -noobsolete $(PRO) 90lupdate.commands = lupdate -noobsolete $(PRO)
91 91
92lrelease.target = lrelease 92lrelease.target = lrelease
93lrelease.commands = lrelease $(PRO) 93lrelease.commands = lrelease $(PRO)
94 94
95# new message target to get all strings from the apps with and without tr 95# new message target to get all strings from the apps with and without tr
96messages.target = messages 96messages.target = messages
97messages.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' 97messages.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'
98 98
99ipk.target = ipk 99ipk.target = ipk
100ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 100ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
101 101
102QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages 102QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
103 103
104CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) 104CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
105contains( CONFTEST, y ){ 105contains( CONFTEST, y ){
106 QMAKE_LFLAGS += -Wl 106 QMAKE_LFLAGS += -Wl
107 LIBS -= -ldl 107 LIBS -= -ldl
108 LIBS -= -lcrypt 108 LIBS -= -lcrypt
109 LIBS -= -lm 109 LIBS -= -lm
110 110
111 # Manual including indirect referenced libraries which are not loaded 111 # Manual including indirect referenced libraries which are not loaded
112 # by the mac-linker automatically 112 # by the mac-linker automatically
113 # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING
114 # (regarding whether you activate SQL) and the last one (-lopiecore2)
113 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) 115 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
114 contains( CONFTEST, y ){ 116 contains( CONFTEST, y ){
115 LIBS += -lopiedb2 -lqpe 117 LIBS += -lopiedb2 -lqpe
116 } else { 118 } else {
117 LIBS += -lqpe 119 LIBS += -lqpe
118 } 120 }
119 LIBS += -lopiecore2 121 LIBS += -lopiecore2
120} 122}
121else { 123else {
122 124
123QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib 125QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib
124# I am not sure whether it is a good idea to change the way plugins is build 126# I am not sure whether it is a good idea to change the way plugins is build
125# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X 127# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
126CONFIG -= plugin 128CONFIG -= plugin
127} 129}
128LIBS += -L$(OPIEDIR)/lib 130LIBS += -L$(OPIEDIR)/lib
129 131
130MOC_DIR=.moc/$(PLATFORM) 132MOC_DIR=.moc/$(PLATFORM)
131OBJECTS_DIR=.obj/$(PLATFORM) 133OBJECTS_DIR=.obj/$(PLATFORM)
132 134
133#was here now at thetop 135#was here now at thetop
134#include ( $(OPIEDIR)/gen.pro ) 136#include ( $(OPIEDIR)/gen.pro )