Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2010-07-15 14:55:24 -0400
committerDoug Schaefer2010-07-15 14:55:24 -0400
commitf586166f3577dd090e88b4a22a334415ea9fa653 (patch)
tree1c1dc92f77d80e7cc30738f0848c5f61ec228f54
parent9e3c2bfd51103ef84dd524757520c7453e0fe3ff (diff)
downloadorg.eclipse.cdt-f586166f3577dd090e88b4a22a334415ea9fa653.tar.gz
org.eclipse.cdt-f586166f3577dd090e88b4a22a334415ea9fa653.tar.xz
org.eclipse.cdt-f586166f3577dd090e88b4a22a334415ea9fa653.zip
Added support for Windows 7 SDK and removed the others.
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java40
1 files changed, 4 insertions, 36 deletions
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
index e759581b15..b25bd8a364 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
@@ -85,40 +85,12 @@ public class WinEnvironmentVariableSupplier
public static String getSDKDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String[] keys = {
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0",
- };
-
- for (int i = 0; i < keys.length; ++i) {
- String sdkDir = reg.getLocalMachineValue(keys[i], "InstallationFolder");
- if (sdkDir != null)
- return sdkDir;
- }
-
- return null;
+ return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.0", "InstallationFolder");
}
public static String getVCDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String vcDir = reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
- if (vcDir != null)
- return vcDir;
-
- // Try full SDK with compiler
- String sdkDir = getSDKDir();
- if (sdkDir != null)
- return sdkDir.concat("VC\\");
-
- return null;
- }
-
- public static String getVSDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
- return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7", "9.0");
+ return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
}
private void initvars() {
@@ -134,7 +106,6 @@ public class WinEnvironmentVariableSupplier
// INCLUDE
StringBuffer buff = new StringBuffer();
buff.append(vcDir).append("Include;");
- buff.append(vcDir).append("Include\\Sys;");
buff.append(sdkDir).append("Include;");
buff.append(sdkDir).append("Include\\gl;");
addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
@@ -147,12 +118,9 @@ public class WinEnvironmentVariableSupplier
// PATH
buff = new StringBuffer();
-
- String vsDir = getVSDir();
- if (vsDir != null)
- buff.append(vsDir).append("Common7\\IDE;");
-
buff.append(vcDir).append("Bin;");
+ buff.append(vcDir).append("vcpackages;");
+ buff.append(vcDir).append("..\\Common7\\IDE;");
buff.append(sdkDir).append("Bin;");
addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
}

Back to the top