diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-17 21:31:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-21 11:00:21 +0100 |
| commit | 753585b94897f5628cf9c13d8a6c97861074febb (patch) | |
| tree | 42a998f24defdbacb3ef32e7b83c15b42042894e /util/mk1mf.pl | |
| parent | 0351baae36afe1182237e0bd88ec9d13f5c97f32 (diff) | |
Remove the mk1mf VC-WIN* builds and its supporting scripts
The mk1mf build for the VC-WIN* targets is broken and the unified
scheme works well enough, so we clean out the old.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index f03f83dacd..0c525305b9 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -99,11 +99,6 @@ die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq ""; $infile="MINFO"; %ops=( - "VC-WIN32", "Microsoft Visual C++ [4-6] - Windows NT or 9X", - "VC-WIN64I", "Microsoft C/C++ - Win64/IA-64", - "VC-WIN64A", "Microsoft C/C++ - Win64/x64", - "VC-CE", "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY", - "VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY", "Mingw32", "GNU C++ - Windows NT or 9x", "Mingw32-files", "Create files with DOS copy ...", "linux-elf","Linux elf", @@ -201,13 +196,7 @@ if ($platform eq "auto" || $platform eq 'copy') { print STDERR "Imported platform $mf_platform\n"; } -if (($platform =~ /VC-(.+)/)) - { - $FLAVOR=$1; - $NT = 1 if $1 eq "NT"; - require 'VC-32.pl'; - } -elsif ($platform eq "Mingw32") +if ($platform eq "Mingw32") { require 'Mingw32.pl'; } @@ -856,19 +845,6 @@ foreach (values %lib_nam) $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib); } -# hack to add version info on MSVC -if (($platform eq "VC-WIN32") || ($platform eq "VC-WIN64A") - || ($platform eq "VC-WIN64I") || ($platform eq "VC-NT")) { - $rules.= <<"EOF"; -\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc - \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc - -\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc - \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc - -EOF -} - $defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep); foreach (split(/\s+/,$test)) { @@ -1123,14 +1099,6 @@ sub do_defs $Vars{$var}.="$t "; $ret.=$t; } - # hack to add version info on MSVC - if ($shlib && (($platform eq "VC-WIN32") || ($platfrom eq "VC-WIN64I") || ($platform eq "VC-WIN64A") || ($platform eq "VC-NT"))) - { - if ($var eq "CRYPTOOBJ") - { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; } - elsif ($var eq "SSLOBJ") - { $ret.="\$(OBJ_D)\\\$(SSL).res "; } - } chomp($ret); # Does this actually do something? /RL $ret.="\n\n"; return($ret); |