# HG changeset patch
# User timkelly
# Date 1271788426 18000
# Node ID 5995486b4beddc26025b553b221ffa8b0d53a9be
# Parent  8eb0d2bd6e73009899b2611541e37333ba4819e5# Parent  d4fee22b8cbbea431b09694e6f1fff066ccfb3e7
merge commit

diff -r d4fee22b8cbb -r 5995486b4bed builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/DefaultViewConfiguration.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/DefaultViewConfiguration.java	Tue Apr 20 13:08:10 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/DefaultViewConfiguration.java	Tue Apr 20 13:33:46 2010 -0500
@@ -198,6 +198,11 @@
 	public Collection<IDefine> getMacros() {
 		List<IDefine> macros = new ArrayList<IDefine>();
 		if (context != null) {
+			
+			if (context.getSBSv2Alias() != null){
+				macros.add(DefineFactory.createDefine("SBSV2", null));
+			}
+			
 			for (IDefine macro : context.getVariantHRHDefines()) {
 				macros.add(macro);
 			}
diff -r d4fee22b8cbb -r 5995486b4bed builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Tue Apr 20 13:08:10 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Tue Apr 20 13:33:46 2010 -0500
@@ -328,6 +328,10 @@
 	public List<String> getBuiltinMacros() {
 		List<String> macros = new ArrayList<String>();
 		
+		if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(getCarbideProject().getProject())){
+			macros.add("SBSV2"); //$NON-NLS-1$
+		}
+		
 		// add the macros that should always be defined
 		macros.add("__SYMBIAN32__"); //$NON-NLS-1$
 		macros.add("_UNICODE"); //$NON-NLS-1$
diff -r d4fee22b8cbb -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config_sbsv2.png
diff -r d4fee22b8cbb -r 5995486b4bed core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties	Tue Apr 20 13:08:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/messages.properties	Tue Apr 20 13:33:46 2010 -0500
@@ -4,8 +4,8 @@
 CheckS60CustKitSupport.undefSBSV2Code=\
 // When building with Raptor, "gnumakefile" builds are no longer recommended.\n\
 // But the extension Makefiles referenced here are only available in OS 9.5+.\n\
-// Uncomment this to always perform Raptor builds using PRJ_EXTENSIONS.\n\
-\#undef SBSV2\n\
+// Uncomment this to perform Raptor builds using old-style "gnumakefile".\n\
+//\#undef SBSV2\n\
 \n
 
 SBSv2Utils.CannotFindSBSScriptError=Cannot find {0} on the PATH.  Please verify your SBSv2 installation.