builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java
branchC3_BUILDER_WORK
changeset 1471 62024a5fa81d
parent 1462 b38491fd06da
child 1568 508bfdb3a934
equal deleted inserted replaced
1469:5844e41d8bc7 1471:62024a5fa81d
   202 
   202 
   203 		// add platform includes first
   203 		// add platform includes first
   204 		IBSFPlatform platform = null;
   204 		IBSFPlatform platform = null;
   205 		ISBVPlatform sbvPlat = null;
   205 		ISBVPlatform sbvPlat = null;
   206 		if (context instanceof ISBSv1BuildContext) {
   206 		if (context instanceof ISBSv1BuildContext) {
       
   207 			// SBSv1 only
   207 			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
   208 			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
   208 			platform = sbsv1BuildInfo.getBSFCatalog().findPlatform(carbideBuildConfig.getPlatformString());
   209 			platform = sbsv1BuildInfo.getBSFCatalog().findPlatform(carbideBuildConfig.getPlatformString());
   209 			sbvPlat = sbsv1BuildInfo.getSBVCatalog().findPlatform(carbideBuildConfig.getPlatformString());
   210 			sbvPlat = sbsv1BuildInfo.getSBVCatalog().findPlatform(carbideBuildConfig.getPlatformString());
   210 		} else {
   211 		} 
   211 			ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
       
   212 			platform = sbsv2BuildInfo.getBSFCatalog().findPlatform(carbideBuildConfig.getPlatformString());
       
   213 			sbvPlat = sbsv2BuildInfo.getSBVCatalog().findPlatform(carbideBuildConfig.getPlatformString());
       
   214 		}
       
   215 		if (platform != null) {
   212 		if (platform != null) {
   216 			IPath[] systemIncludePaths = platform.getSystemIncludePaths();
   213 			IPath[] systemIncludePaths = platform.getSystemIncludePaths();
   217 			for (IPath path : systemIncludePaths) {
   214 			for (IPath path : systemIncludePaths) {
   218 				includeEntries.add(new CIncludePathEntry(path, 0));
   215 				includeEntries.add(new CIncludePathEntry(path, 0));
   219 			}
   216 			}