# HG changeset patch
# User rsaid
# Date 1264611922 21600
# Node ID abb91251bab6bb7561971e802725b29b74522153
# Parent  b363199c7c6e02536f7b513b465a4def20c9e3e0# Parent  57d9fe8bebacc28ada441361b48c6ac9fbeb6285
merge commit

diff -r 57d9fe8bebac -r abb91251bab6 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Wed Jan 27 10:55:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Wed Jan 27 11:05:22 2010 -0600
@@ -40,8 +40,11 @@
 	private static final String S60_MIDDWARE_INC = "epoc32/include/middleware";
 	
 	private static final String S60_MIDDWARE_INC2 =  "epoc32/include/mw";
-	private static final String S60_INC_MACROS2 = "#include <domain/osextensions/platform_paths.hrh>\nAPP_LAYER_SYSTEMINCLUDE";
 
+	private static final String S60_DOMAND_OSTEXT_PLAT_PATHS = "epoc32/include/domain/osextensions/platform_paths.hrh"; 
+	private static final String S60_DOMAND_OSTEXT_PLAT_PATHS_INCLUDE = "#include <domain/osextensions/platform_paths.hrh>";
+	private static final String APP_LAYER_SYSTEM_INCLUDES = "APP_LAYER_SYSTEMINCLUDE"; 
+	
 	private static final String S60_SF_FOLDER =  "sf";
 	private static final String S60_INC_MACROS_SF = "#include <platform_paths.hrh>\n#include <data_caging_paths.hrh>\nAPP_LAYER_SYSTEMINCLUDE";
 
@@ -145,7 +148,16 @@
 					
 					if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
 						// add symbol as at least one build config is a CustKit
-						S60_50_Macros_String = S60_INC_MACROS2;
+						File domainPath = new File(sdk.getEPOCROOT(), S60_DOMAND_OSTEXT_PLAT_PATHS); 
+						if (domainPath.exists()){ 
+							S60_50_Macros_String = S60_DOMAND_OSTEXT_PLAT_PATHS_INCLUDE + "\n"; 
+						}
+						//else { 
+						// The platform_paths include is in the variant.cfg defined prefix file
+						//} 
+						
+						S60_50_Macros_String += APP_LAYER_SYSTEM_INCLUDES; 
+						
 						break;
 					}
 
diff -r 57d9fe8bebac -r abb91251bab6 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java