# HG changeset patch
# User timkelly
# Date 1260808443 21600
# Node ID ddf26173285375fd414d8595fb18928a60cb549f
# Parent  80524b72f957f6ed8723b7e5e8dcbcc77ca00353
Fix bug 10166. Use rvct.h as fallback for rvct tools preinclude

diff -r 80524b72f957 -r ddf261732853 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Thu Dec 10 13:45:47 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Dec 14 10:34:03 2009 -0600
@@ -305,7 +305,14 @@
 		if (installedRVCTTools.length > 0) {
 			rvctFragment = getRVCTFragment(installedRVCTTools[0]);
 		}
-		return getSDK().getIncludePath().append(rvctFragment).append(rvctFragment + ".h"); //$NON-NLS-1$
+		IPath prefixFilePath = getSDK().getIncludePath().append(rvctFragment).append(rvctFragment + ".h"); //$NON-NLS-1$
+		if (prefixFilePath.toFile().exists()){
+			return prefixFilePath;
+		} else {
+			// SF kits around SF^3 started to only use a single rvct.h header instead of specific versioned ones
+			// based on the default installation
+			return getSDK().getIncludePath().append("rvct").append("rvct" + ".h"); //$NON-NLS-1$
+		}
 	}
 
 	private String getRVCTFragment(IRVCTToolChainInfo info) {