From fdcd85087147e0f016f667706a27899f49e836f0 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 16 Aug 2012 13:23:56 -0400 Subject: enable build with Visual Studio 2012 Change-Id: I95e5974e4f109eb8882f7260d19c439a86931e64 --- oowintool | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'oowintool') diff --git a/oowintool b/oowintool index de929cb026c3..9e40a78102f7 100755 --- a/oowintool +++ b/oowintool @@ -151,10 +151,22 @@ my %msvc_2010 = ( 'dll_path' => 'redist/x86/Microsoft.VC100.CRT', 'dll_suffix' => '100' ); +my %msvs_2012 = ( + 'ver' => '11.0', + 'key' => 'Microsoft/VisualStudio/11.0/Setup/VS/ProductDir', + 'dll_path' => 'VC/redist/x86/Microsoft.VC110.CRT', + 'dll_suffix' => '110' +); +my %msvc_2012 = ( + 'ver' => '11.0', + 'key' => 'Microsoft/VisualStudio/11.0/Setup/VC/ProductDir', + 'dll_path' => 'redist/x86/Microsoft.VC110.CRT', + 'dll_suffix' => '110' +); sub find_msvs() { - my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 ); + my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, \%msvs_2010 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); @@ -168,7 +180,7 @@ sub find_msvs() sub find_msvc() { - my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 ); + my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, \%msvc_2010 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); -- cgit