diff options
| author | Adam <Adam@anope.org> | 2010-07-04 15:10:06 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-07-04 15:10:06 -0400 |
| commit | f5a7a5d8bcc5645a6667f2c6328060dbaa407218 (patch) | |
| tree | 87f406a295b7099168c51db79d10a71b88378453 | |
| parent | ca7769d8b4ecc070320a727dbe307872523a0766 (diff) | |
Made install.js detect VS 2010 on 64bit machines
| -rw-r--r-- | install.js | 22 | ||||
| -rw-r--r-- | version.log | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/install.js b/install.js index b88687ad8..825d524cc 100644 --- a/install.js +++ b/install.js @@ -71,6 +71,22 @@ var installerQuestions = [ var buildPackages = [ { + 'name' : 'Microsoft Visual Studio 2010 (64bit)', + 'libpaths' : [ + 'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\lib', + 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib' + ], + 'incpaths': [ + 'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\include', + 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\include' + ], + 'nmake' : [ + 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin', + ], + 'additional_switches' : [ '/w' ], + 'installedDrive' : 'C' + }, + { 'name' : 'Microsoft Visual Studio 2010', 'libpaths' : [ 'Program Files\\Microsoft Visual Studio 10.0\\VC\\lib', @@ -87,7 +103,7 @@ var buildPackages = [ 'installedDrive' : 'C' }, { - 'name' : 'Microsoft Visual Studio 2008 (New PSDK)', + 'name' : 'Microsoft Visual Studio 2008', 'libpaths' : [ 'Program Files\\Microsoft Visual Studio 9.0\\VC\\Lib', 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib' @@ -103,7 +119,7 @@ var buildPackages = [ 'installedDrive' : 'C' }, { - 'name' : 'Microsoft Visual Studio 2008 (64bit) (New PSDK)', + 'name' : 'Microsoft Visual Studio 2008 (64bit)', 'libpaths' : [ 'Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Lib', 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib' @@ -120,7 +136,7 @@ var buildPackages = [ }, { - 'name' : 'Microsoft Visual Studio 2005 (New PSDK)', + 'name' : 'Microsoft Visual Studio 2005', 'libpaths' : [ 'Program Files\\Microsoft Visual Studio 8\\VC\\Lib', 'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib' diff --git a/version.log b/version.log index d9afa93e3..049e0754e 100644 --- a/version.log +++ b/version.log @@ -8,7 +8,7 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="4" VERSION_EXTRA="-git" -VERSION_BUILD="3010" +VERSION_BUILD="3011" # $Log$ # Changes since the 1.8.4 Release #Revision 3010 - Encrypt very long passwords properly on /ns and /cs register |