core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java
equal
deleted
inserted
replaced
396 getSDK().setPrefixFile(prefixCheck); |
396 getSDK().setPrefixFile(prefixCheck); |
397 } |
397 } |
398 } |
398 } |
399 |
399 |
400 if (prefixFile != null) { |
400 if (prefixFile != null) { |
401 |
401 |
|
402 List<File> systemPaths = new ArrayList<File>(); |
|
403 // Always add epoc32/include to the search path as this is implicit for includes in the HRH |
|
404 systemPaths.add(new File(getSDK().getEPOCROOT() + "epoc32/include")); |
|
405 |
402 // add any BSF/SBV includes so the headers are picked up from the correct location |
406 // add any BSF/SBV includes so the headers are picked up from the correct location |
403 List<File> systemPaths = new ArrayList<File>(); |
|
404 IBSFPlatform bsfPlat = getSDK().getBSFCatalog().findPlatform(platform); |
407 IBSFPlatform bsfPlat = getSDK().getBSFCatalog().findPlatform(platform); |
405 ISBVPlatform sbvPlat = getSDK().getSBVCatalog().findPlatform(platform); |
408 ISBVPlatform sbvPlat = getSDK().getSBVCatalog().findPlatform(platform); |
406 if (bsfPlat != null) { |
409 if (bsfPlat != null) { |
407 for (IPath path : bsfPlat.getSystemIncludePaths()) { |
410 for (IPath path : bsfPlat.getSystemIncludePaths()) { |
408 systemPaths.add(path.toFile()); |
411 systemPaths.add(path.toFile()); |