diff options
| author | dnobori <da.git@softether.co.jp> | 2015-03-26 12:01:02 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2015-03-26 12:01:02 +0300 |
| commit | 1f645c981601767d6170c11b4241401fca3815b5 (patch) | |
| tree | c5c9e53bc6b362bb382cba65852bef3737032bb1 /src/BuildUtil | |
| parent | 64fd19e6f849247e3daee765ad278c6bf072afcb (diff) | |
v4.15-9537-beta
Diffstat (limited to 'src/BuildUtil')
| -rw-r--r-- | src/BuildUtil/BuildUtil.csproj | 2 | ||||
| -rw-r--r-- | src/BuildUtil/VpnBuilder.cs | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/BuildUtil/BuildUtil.csproj b/src/BuildUtil/BuildUtil.csproj index 929d944a..8710d63b 100644 --- a/src/BuildUtil/BuildUtil.csproj +++ b/src/BuildUtil/BuildUtil.csproj @@ -39,7 +39,7 @@ <DefineConstants>TRACE;DEBUG;BU_SOFTETHER;BU_OSS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>
</DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
diff --git a/src/BuildUtil/VpnBuilder.cs b/src/BuildUtil/VpnBuilder.cs index 04ff6aa5..b15b818f 100644 --- a/src/BuildUtil/VpnBuilder.cs +++ b/src/BuildUtil/VpnBuilder.cs @@ -376,7 +376,14 @@ namespace BuildUtil // Get the VC++ directory
// Visual Studio 2008
- Paths.VisualStudioVCDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC", "ProductDir"));
+ if (IntPtr.Size == 4)
+ {
+ Paths.VisualStudioVCDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC", "ProductDir"));
+ }
+ else
+ {
+ Paths.VisualStudioVCDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0\Setup\VC", "ProductDir"));
+ }
if (Str.IsEmptyStr(Paths.VisualStudioVCDir))
{
throw new ApplicationException("Visual C++ directory not found.\n");
@@ -396,7 +403,14 @@ namespace BuildUtil bool x86_dir = false;
// Get Microsoft SDK 6.0a directory
- Paths.MicrosoftSDKDir = IO.RemoteLastEnMark(Reg.ReadStr(RegRoot.LocalMachine, @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A", "InstallationFolder"));
+ 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");
|