# HG changeset patch
# User timkelly
# Date 1239141620 18000
# Node ID 3cbba6e5b6e08c45995ac9243ebad73c782b86bb
# Parent  3d135308d21ebe0b1efb648d36d093db84fa4d1b
Fix bug 8478, for middleware path change

diff -r 3d135308d21e -r 3cbba6e5b6e0 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	Tue Apr 07 15:22:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Tue Apr 07 17:00:20 2009 -0500
@@ -32,8 +32,14 @@
 	
 	private static final String SELECTED_BUILD_CONFIGS_VALUE_KEY = "selectedBuildConfigs"; //$NON-NLS-1$
 	private static final String S60_50_BUILD_MACROS = "S60_50_CustomBuildIncludes";
+	
 	private static final String S60_INC_MACROS = "#include <data_caging_paths.hrh>\n#include <domain/osextensions/platform_paths.hrh>\nMW_LAYER_SYSTEMINCLUDE";
 	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";
+
+	
 	protected IProject project;
 
 	@Override
@@ -75,6 +81,15 @@
 						S60_50_Macros_String = S60_INC_MACROS;
 						break;
 					}
+					else {
+						// try newer middleware paths moved to app layer includes
+						middleWareInclude = new File(sdk.getEPOCROOT() + S60_MIDDWARE_INC2);
+						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;
+							break;
+						}
+					}
 				}
 			}
 		}