mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

Added support for Windows 7 SDK and removed the others.

Browse source
This commit is contained in:
Doug Schaefer 2010-07-15 18:55:24 +00:00
parent 9e3c2bfd51
commit f586166f35
1 changed files with 4 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
View file

@ -85,40 +85,12 @@ public class WinEnvironmentVariableSupplier
public static String getSDKDir() { public static String getSDKDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.0", "InstallationFolder");
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;
} }
public static String getVCDir() { public static String getVCDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
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");
} }
private void initvars() { private void initvars() {
@ -134,7 +106,6 @@ public class WinEnvironmentVariableSupplier
// INCLUDE // INCLUDE
StringBuffer buff = new StringBuffer(); StringBuffer buff = new StringBuffer();
buff.append(vcDir).append("Include;"); buff.append(vcDir).append("Include;");
buff.append(vcDir).append("Include\\Sys;");
buff.append(sdkDir).append("Include;"); buff.append(sdkDir).append("Include;");
buff.append(sdkDir).append("Include\\gl;"); buff.append(sdkDir).append("Include\\gl;");
addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
@ -147,12 +118,9 @@ public class WinEnvironmentVariableSupplier
// PATH // PATH
buff = new StringBuffer(); buff = new StringBuffer();
String vsDir = getVSDir();
if (vsDir != null)
buff.append(vsDir).append("Common7\\IDE;");
buff.append(vcDir).append("Bin;"); buff.append(vcDir).append("Bin;");
buff.append(vcDir).append("vcpackages;");
buff.append(vcDir).append("..\\Common7\\IDE;");
buff.append(sdkDir).append("Bin;"); buff.append(sdkDir).append("Bin;");
addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
} }