# HG changeset patch
# User timkelly
# Date 1265124783 21600
# Node ID 73e89d44155889e5594ff6d1ac01cdf5f072a8a4
# Parent  e6d79d096976a67798769ea9c8da626bd49c03eb
Don't add \epoc32\include to MMP for GUI template if APP_LAYER_SYSTEMINLCUDES is already defined.

diff -r e6d79d096976 -r 73e89d441558 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 Feb 02 09:17:13 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Tue Feb 02 09:33:03 2010 -0600
@@ -42,6 +42,7 @@
 	private static final String SBSV2_BUILDER_ATTRIBUTE = "useSBSv2Builder"; //$NON-NLS-1$
 
 	private static final String S60_50_BUILD_MACROS = "S60_50_CustomBuildIncludes";
+	private static final String EXPLICIT_EPOC32_SYSTEM_INCLUDE = "EPOC32SystemInclude";
 	
 	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";
@@ -79,7 +80,13 @@
 		String includesValue = "";
 		includesValue = createCustKitIncludes(template);
 		template.getTemplateValues().put(S60_50_BUILD_MACROS, includesValue);
-
+		
+		String explicitEpoc32Include = "";
+		if (!includesValue.contains(APP_LAYER_SYSTEM_INCLUDES)){
+			explicitEpoc32Include = "SYSTEMINCLUDE	 /epoc32/include";
+		}
+		template.getTemplateValues().put(EXPLICIT_EPOC32_SYSTEM_INCLUDE, explicitEpoc32Include); //$NON-NLS-1$
+		
 		String helpCompiler = findHelpCompiler(template);
 		String enableHelpString = "";
 		String enableHelpSISString = "";
diff -r e6d79d096976 -r 73e89d441558 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/baseName.mmp
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/baseName.mmp	Tue Feb 02 09:17:13 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/baseName.mmp	Tue Feb 02 09:33:03 2010 -0600
@@ -33,12 +33,10 @@
 TARGETPATH 	  \private\10003a3f\apps
 END //RESOURCE
 
-
-
 USERINCLUDE	   ..\$(incDir)
 USERINCLUDE    ..\$(helpDir)
 
-SYSTEMINCLUDE	 \epoc32\include
+$(EPOC32SystemInclude)
 
 LIBRARY		   euser.lib
 LIBRARY		   apparc.lib
diff -r e6d79d096976 -r 73e89d441558 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/baseName.mmp
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/baseName.mmp	Tue Feb 02 09:17:13 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/baseName.mmp	Tue Feb 02 09:33:03 2010 -0600
@@ -33,12 +33,10 @@
 TARGETPATH 	  \private\10003a3f\apps
 END //RESOURCE
 
-
-
 USERINCLUDE	   ..\$(incDir)
 USERINCLUDE    ..\$(helpDir)
 
-SYSTEMINCLUDE	 \epoc32\include
+$(EPOC32SystemInclude)
 
 LIBRARY		   euser.lib
 LIBRARY		   apparc.lib