builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java
equal
deleted
inserted
replaced
280 macros.put(builtinMacro, ""); //$NON-NLS-1$ |
280 macros.put(builtinMacro, ""); //$NON-NLS-1$ |
281 } |
281 } |
282 } else { |
282 } else { |
283 ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER); |
283 ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER); |
284 // platform macros |
284 // platform macros |
285 for (String platMacro : sbsv2BuildInfo.getPlatformMacros(carbideBuildConfig.getPlatformString())) { |
285 macros.putAll(sbsv2BuildInfo.getPlatformMacros(carbideBuildConfig.getPlatformString())); |
286 macros.put("__" + platMacro + "__", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ |
|
287 } |
|
288 |
|
289 } |
286 } |
290 |
287 |
291 // built in macros |
288 // built in macros |
292 for (String builtinMacro : carbideBuildConfig.getBuiltinMacros()) { |
289 for (String builtinMacro : carbideBuildConfig.getBuiltinMacros()) { |
293 macros.put(builtinMacro, ""); //$NON-NLS-1$ |
290 macros.put(builtinMacro, ""); //$NON-NLS-1$ |