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

util/pl/VC-32.pl: make fipscanister.lib universally usable.

Browse Source
This commit is contained in:
Andy Polyakov 2012-10-27 21:16:00 +00:00
parent 226afe4956
commit 8be18f3459
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
util/pl/VC-32.pl
View File

@ -49,8 +49,7 @@ if ($FLAVOR =~ /WIN64/)
# considered safe to ignore. # considered safe to ignore.
# #
$base_cflags= " $mf_cflag"; $base_cflags= " $mf_cflag";
my $f = $shlib?' /MD':' /MT'; my $f = ($shlib and !$fipscanisterbuild)?' /MD':' /MT';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox'; $opt_cflags=$f.' /Ox';
$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";
@ -127,19 +126,24 @@ elsif ($FLAVOR =~ /CE/)
$base_cflags.=" $wcecdefs"; $base_cflags.=" $wcecdefs";
$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'}));
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... if (`cl 2>&1` =~ /Version 1[4-9]\./) {
$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; $base_cflags.=($shlib and !$fipscanisterbuild)?' /MD':' /MT';
} else {
$base_cflags.=' /MC';
}
$opt_cflags=' /O1i'; # optimize for space, but with intrinsics...
$dbg_clfags=' /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /opt:ref $wcelflag"; $lflags="/nologo /opt:ref $wcelflag";
} }
else # Win32 else # Win32
{ {
$base_cflags= " $mf_cflag"; $base_cflags= " $mf_cflag";
my $f = $shlib?' /MD':' /MT'; my $f = ($shlib and !$fipscanisterbuild)?' /MD':' /MT';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$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_cflag='/Zl' if (!$shlib or $fipscanisterbuild); # remove /DEFAULTLIBs
$mlflags=''; $mlflags='';
$out_def ="out32"; $out_def.="dll" if ($shlib); $out_def ="out32"; $out_def.="dll" if ($shlib);
@ -284,7 +288,8 @@ elsif ($shlib && $FLAVOR =~ /CE/)
{ {
$mlflags.=" $lflags /dll"; $mlflags.=" $lflags /dll";
$lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'})); $lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
$lib_cflag.=" -D_WINDLL -D_DLL"; $lib_cflag.=" -D_WINDLL";
$lib_cflag.=" -D_DLL" if (!$fipscanisterbuild);
} }
sub do_lib_rule sub do_lib_rule