Merge PR SoftEtherVPN#813: BuildUtil: fix an issue encountered with V…

…isual Studio 2008 on Windows XP
leonardospeca · Sep 18, 2020 · 684d17e · 684d17e
2 parents 1c4b257 + efd2413
commit 684d17e
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/BuildUtil/VpnBuilder.cs b/src/BuildUtil/VpnBuilder.cs
@@ -269,14 +269,17 @@ static Paths()
 			}
 
 			// Get the VC++ directory
+			// Get Microsoft SDK 6.0a directory
 			// Visual Studio 2008
 			if (IntPtr.Size == 4)
 			{
 				Paths.VisualStudioVCDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC", "ProductDir"));
+				Paths.MicrosoftSDKDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A", "InstallationFolder"));
 			}
 			else
 			{
 				Paths.VisualStudioVCDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0\Setup\VC", "ProductDir"));
+				Paths.MicrosoftSDKDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v6.0A", "InstallationFolder"));
 			}
 			if (Str.IsEmptyStr(Paths.VisualStudioVCDir))
 			{
@@ -296,16 +299,6 @@ static Paths()
 
 			bool x86_dir = false;
 
-			// Get Microsoft SDK 6.0a directory
-			if (IntPtr.Size == 4)
-			{
-				Paths.MicrosoftSDKDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v6.0A", "InstallationFolder"));
-			}
-			else
-			{
-				Paths.MicrosoftSDKDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A", "InstallationFolder"));
-			}
-
 			// Get makecat.exe file name
 			Paths.MakeCatFilename = Path.Combine(Paths.MicrosoftSDKDir, @"bin\" + (x86_dir ? @"x86\" : "") + "makecat.exe");