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

VC-32.pl: unconditionally generate symbols.pdb [from HEAD].

Browse Source
This commit is contained in:
Andy Polyakov 2010-06-01 06:03:20 +00:00
parent 938c0bbae1
commit 9728978b75
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,21 +122,26 @@ else # Win32
} }
$mlflags=''; $mlflags='';
$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); $out_def ="out32"; $out_def.="dll" if ($shlib);
$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
$tmp_def ="tmp32"; $tmp_def.="dll" if ($shlib);
$tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
$inc_def="inc32"; $inc_def="inc32";
if ($debug) if ($debug)
{ {
$cflags=$dbg_cflags.$base_cflags; $cflags=$dbg_cflags.$base_cflags;
$lflags.=" /debug";
$mlflags.=' /debug';
} }
else else
{ {
$cflags=$opt_cflags.$base_cflags; $cflags=$opt_cflags.$base_cflags;
} }
# generate symbols.pdb unconditionally
$app_cflag.=" /Zi /Fd$tmp_def/app";
$lib_cflag.=" /Zi /Fd$tmp_def/lib";
$lflags.=" /debug";
$obj='.obj'; $obj='.obj';
$asm_suffix='.asm'; $asm_suffix='.asm';
$ofile="/Fo"; $ofile="/Fo";
@ -176,18 +181,15 @@ $lfile='/out:';
$shlib_ex_obj=""; $shlib_ex_obj="";
$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/); $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
if ($FLAVOR =~ /WIN64A/) { if ($FLAVOR =~ /WIN64A/) {
if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
$asm='nasm -f win64 -DNEAR -Ox'; $asm='nasm -f win64 -DNEAR -Ox -g';
$asm.=' -g' if $debug;
$afile='-o '; $afile='-o ';
} else { } else {
$asm='ml64 /c /Cp /Cx'; $asm='ml64 /c /Cp /Cx /Zi';
$asm.=" /Zi" if $debug;
$afile='/Fo'; $afile='/Fo';
} }
} elsif ($FLAVOR =~ /WIN64I/) { } elsif ($FLAVOR =~ /WIN64I/) {
$asm='ias'; $asm='ias -d debug';
$asm.=" -d debug" if $debug;
$afile="-o "; $afile="-o ";
} elsif ($nasm) { } elsif ($nasm) {
my $ver=`nasm -v 2>NUL`; my $ver=`nasm -v 2>NUL`;
@ -197,8 +199,7 @@ if ($FLAVOR =~ /WIN64A/) {
$asmtype="win32n"; $asmtype="win32n";
$afile='-o '; $afile='-o ';
} else { } else {
$asm='ml /nologo /Cp /coff /c /Cx'; $asm='ml /nologo /Cp /coff /c /Cx /Zi';
$asm.=" /Zi" if $debug;
$afile='/Fo'; $afile='/Fo';
$asmtype="win32"; $asmtype="win32";
} }
@ -230,9 +231,7 @@ if (!$no_asm)
if ($shlib && $FLAVOR !~ /CE/) if ($shlib && $FLAVOR !~ /CE/)
{ {
$mlflags.=" $lflags /dll"; $mlflags.=" $lflags /dll";
$lib_cflag=" -D_WINDLL"; $lib_cflag.=" -D_WINDLL";
$out_def="out32dll";
$tmp_def="tmp32dll";
# #
# Engage Applink... # Engage Applink...
# #
@ -262,13 +261,9 @@ 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 -D_DLL";
$out_def='out32dll_$(TARGETCPU)';
$tmp_def='tmp32dll_$(TARGETCPU)';
} }
$cflags.=" /Fd$out_def";
sub do_lib_rule sub do_lib_rule
{ {
local($objs,$target,$name,$shlib)=@_; local($objs,$target,$name,$shlib)=@_;