Changeset View
Changeset View
Standalone View
Standalone View
projectbuilders/makebuilder/makejob.cpp
Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Line(s) | 200 | { | |||
---|---|---|---|---|---|
201 | ProjectBaseItem* it = item(); | 201 | ProjectBaseItem* it = item(); | ||
202 | if(!it) | 202 | if(!it) | ||
203 | return QStringList(); | 203 | return QStringList(); | ||
204 | QStringList cmdline; | 204 | QStringList cmdline; | ||
205 | 205 | | |||
206 | KSharedConfigPtr configPtr = it->project()->projectConfiguration(); | 206 | KSharedConfigPtr configPtr = it->project()->projectConfiguration(); | ||
207 | KConfigGroup builderGroup( configPtr, "MakeBuilder" ); | 207 | KConfigGroup builderGroup( configPtr, "MakeBuilder" ); | ||
208 | 208 | | |||
209 | QString makeBin = builderGroup.readEntry("Make Binary", MakeBuilderPreferences::standardMakeCommand()); | 209 | // TODO: migrate to more generic key term "Make Executable" | ||
210 | QString makeBin = builderGroup.readEntry("Make Binary", MakeBuilderPreferences::standardMakeExecutable()); | ||||
210 | cmdline << makeBin; | 211 | cmdline << makeBin; | ||
211 | 212 | | |||
212 | if( ! builderGroup.readEntry("Abort on First Error", true)) | 213 | if( ! builderGroup.readEntry("Abort on First Error", true)) | ||
213 | { | 214 | { | ||
214 | cmdline << (isNMake(makeBin) ? "/K" : "-k"); | 215 | cmdline << (isNMake(makeBin) ? "/K" : "-k"); | ||
215 | } | 216 | } | ||
216 | 217 | | |||
217 | // note: nmake does not support the -j flag | 218 | // note: nmake does not support the -j flag | ||
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines |