diff options
| author | Jesús Corrius <jesus@softcatala.org> | 2010-10-15 01:36:09 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-15 02:23:59 +0200 |
| commit | f06879087e872786f56084f504f3296ee79a0ee5 (patch) | |
| tree | d83ee98e574ad12c2c942b5c6ea4e4a2123f5bac /oowintool | |
| parent | 5270167c759773bee48942b1cf6c7c66ebe97535 (diff) | |
Enable Microsoft Visual C++ 10 compiler in the build system
Diffstat (limited to 'oowintool')
| -rwxr-xr-x | oowintool | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/oowintool b/oowintool index c02fc42661c5..890114a70994 100755 --- a/oowintool +++ b/oowintool @@ -198,9 +198,25 @@ my %msvc_express_2008 = ( 'dll_suffix' => '90' ); +my %msvs_2010 = ( + 'ver' => '10.0', + 'key' => 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir', + 'instmsi_path' => '?', + 'dll_path' => 'VC/redist/x86/Microsoft.VC100.CRT', + 'dll_suffix' => '100' +); + +my %msvc_2010 = ( + 'ver' => '10.0', + 'key' => 'Microsoft/VisualStudio/10.0/Setup/VC/ProductDir', + 'instmsi_path' => '?', + 'dll_path' => 'redist/x86/Microsoft.VC100.CRT', + 'dll_suffix' => '100' +); + sub find_msvs() { - my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 ); + my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005,\%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_2010 ); for $ver (@ms_versions) { @@ -215,7 +231,7 @@ sub find_msvs() sub find_msvc() { - my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 ); + my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003, \%msvc_2010 ); for $ver (@ms_versions) { @@ -316,7 +332,7 @@ sub msvc_copy_dlls($) $dest . $ver->{'dll_suffix'}); copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll", $dest . $ver->{'dll_suffix'}); - if ($ver->{'dll_suffix'} >= 90) { + if ($ver->{'dll_suffix'} == 90) { copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll", $dest . $ver->{'dll_suffix'}); copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'}); |