generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

util/pl/VC-32.pl: harmonize with 1.0.1 and fix typo.

Browse Source
This commit is contained in:
Andy Polyakov 2014-02-25 13:41:40 +01:00
parent efe835eb5a
commit c3006e0f5a
1 changed files with 3 additions and 3 deletions

6
util/pl/VC-32.pl

@ -119,7 +119,7 @@ elsif ($FLAVOR =~ /CE/)
$base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'})); $base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'}));
$base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'})); $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'}));
if (`$cc 2>&1` =~ /Version ([0-9]+)\./ && $1>=14) { if (`$cc 2>&1` =~ /Version ([0-9]+)\./ && $1>=14) {
$base_cflags.=($shlib and !$fipscanisterbuild)?' /MD':' /MT'; $base_cflags.=$shlib?' /MD':' /MT';
} else { } else {
$base_cflags.=' /MC'; $base_cflags.=' /MC';
} }
@ -130,13 +130,13 @@ elsif ($FLAVOR =~ /CE/)
else # Win32 else # Win32
{ {
$base_cflags= " $mf_cflag"; $base_cflags= " $mf_cflag";
my $f = $shlib?' /MD':' /MT'; my $f = $shlib || $fips ?' /MD':' /MT';
$ff = "/fixed"; $ff = "/fixed";
$opt_cflags=$f.' /Ox /O2 /Ob2'; $opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref"; $lflags="/nologo /subsystem:console /opt:ref";
} }
$lib_cflags='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$mlflags=''; $mlflags='';
$out_def ="out32"; $out_def.="dll" if ($shlib); $out_def ="out32"; $out_def.="dll" if ($shlib);