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

Update to support Windows SDK 7.1 with Visual C++ 10.0.

Browse source
This commit is contained in:
Doug Schaefer 2011-03-07 21:18:01 +00:00
parent 4139718baa
commit 428fbeac02
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,13 +81,21 @@ public class WinEnvironmentVariableSupplier
return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]); return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
} }
// Current support is for Windows SDK 7.1 with Visual C++ 10.0
// Secondary support for Windows SDK 7.0 with Visual C++ 9.0
private static String getSDKDir() { private static String getSDKDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
String sdkDir = reg.getLocalMachineValue("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.1", "InstallationFolder");
if (sdkDir != null)
return sdkDir;
return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.0", "InstallationFolder"); return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.0", "InstallationFolder");
} }
private static String getVCDir() { private static String getVCDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
String vcDir = reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "10.0");
if (vcDir != null)
return vcDir;
return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0"); return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
} }
@ -142,9 +150,10 @@ public class WinEnvironmentVariableSupplier
// PATH // PATH
buff = new StringBuffer(); buff = new StringBuffer();
if (vcDir != null) { if (vcDir != null) {
buff.append(vcDir).append("..\\Common7\\IDE;");
buff.append(vcDir).append("..\\Common7\\Tools;");
buff.append(vcDir).append("Bin;"); buff.append(vcDir).append("Bin;");
buff.append(vcDir).append("vcpackages;"); buff.append(vcDir).append("vcpackages;");
buff.append(vcDir).append("..\\Common7\\IDE;");
} }
if (sdkDir != null) { if (sdkDir != null) {
buff.append(sdkDir).append("Bin;"); buff.append(sdkDir).append("Bin;");