author | kergoth <kergoth> | 2003-01-16 06:18:34 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-16 06:18:34 (UTC) |
commit | 9a90cb1a9e61d2bc3298f2131671d9f32abbac5a (patch) (unidiff) | |
tree | 1d2d0eb0372f32e682fe139b3e89882f381dc0db /qmake | |
parent | 216efd1cb2210211816b865b5574866e598bf3bd (diff) | |
download | opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.zip opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.gz opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.bz2 |
i18n for new buildsystem :)
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 1797b98..cbe2014 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp | |||
@@ -191,48 +191,49 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) | |||
191 | if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) { | 191 | if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) { |
192 | increment = TRUE; | 192 | increment = TRUE; |
193 | incrs_out.append((*objit)); | 193 | incrs_out.append((*objit)); |
194 | break; | 194 | break; |
195 | } | 195 | } |
196 | } | 196 | } |
197 | if(!increment) | 197 | if(!increment) |
198 | t << "\\\n\t\t" << (*objit); | 198 | t << "\\\n\t\t" << (*objit); |
199 | } | 199 | } |
200 | if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done! | 200 | if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done! |
201 | t << incrs_out.join(" \\\n\t\t") << endl; | 201 | t << incrs_out.join(" \\\n\t\t") << endl; |
202 | } else if(!incrs_out.count()) { | 202 | } else if(!incrs_out.count()) { |
203 | t << endl; | 203 | t << endl; |
204 | } else { | 204 | } else { |
205 | moc_incremental = TRUE; | 205 | moc_incremental = TRUE; |
206 | t << endl; | 206 | t << endl; |
207 | t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl; | 207 | t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl; |
208 | } | 208 | } |
209 | } else { | 209 | } else { |
210 | t << "OBJMOC = " << objMoc << endl; | 210 | t << "OBJMOC = " << objMoc << endl; |
211 | } | 211 | } |
212 | if(do_incremental && !moc_incremental && !src_incremental) | 212 | if(do_incremental && !moc_incremental && !src_incremental) |
213 | do_incremental = FALSE; | 213 | do_incremental = FALSE; |
214 | t << "DIST = " << varList("DISTFILES") << endl; | 214 | t << "DIST = " << varList("DISTFILES") << endl; |
215 | t << "PRO = " << fileFixify(project->projectFile()) << endl; | ||
215 | t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl; | 216 | t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl; |
216 | t << "DESTDIR = " << var("DESTDIR") << endl; | 217 | t << "DESTDIR = " << var("DESTDIR") << endl; |
217 | t << "TARGET = " << var("TARGET") << endl; | 218 | t << "TARGET = " << var("TARGET") << endl; |
218 | if(project->isActiveConfig("plugin") ) { | 219 | if(project->isActiveConfig("plugin") ) { |
219 | t << "TARGETD = " << var("TARGET") << endl; | 220 | t << "TARGETD = " << var("TARGET") << endl; |
220 | } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) { | 221 | } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) { |
221 | t << "TARGETA= " << var("TARGETA") << endl; | 222 | t << "TARGETA= " << var("TARGETA") << endl; |
222 | if (os == "hpux") { | 223 | if (os == "hpux") { |
223 | t << "TARGETD= " << var("TARGET_x") << endl; | 224 | t << "TARGETD= " << var("TARGET_x") << endl; |
224 | t << "TARGET0= " << var("TARGET_") << endl; | 225 | t << "TARGET0= " << var("TARGET_") << endl; |
225 | } | 226 | } |
226 | else { | 227 | else { |
227 | t << "TARGETD= " << var("TARGET_x.y.z") << endl; | 228 | t << "TARGETD= " << var("TARGET_x.y.z") << endl; |
228 | t << "TARGET0= " << var("TARGET_") << endl; | 229 | t << "TARGET0= " << var("TARGET_") << endl; |
229 | t << "TARGET1= " << var("TARGET_x") << endl; | 230 | t << "TARGET1= " << var("TARGET_x") << endl; |
230 | t << "TARGET2= " << var("TARGET_x.y") << endl; | 231 | t << "TARGET2= " << var("TARGET_x.y") << endl; |
231 | } | 232 | } |
232 | } | 233 | } |
233 | t << endl; | 234 | t << endl; |
234 | 235 | ||
235 | // blasted incldues | 236 | // blasted incldues |
236 | QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"]; | 237 | QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"]; |
237 | QStringList::Iterator it; | 238 | QStringList::Iterator it; |
238 | for( it = qeui.begin(); it != qeui.end(); ++it) | 239 | for( it = qeui.begin(); it != qeui.end(); ++it) |