diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
| commit | eb8e32daea99b6e3ebf134efeeba184c23817f08 (patch) | |
| tree | ffbda57952ba3f40612e6409bd9a95f9a0a892dc /openssl/util/pl | |
| parent | ed16af1abc515d7cc3ff9c5794aef89551fe7494 (diff) | |
| parent | fef0b61e18b9c7475e4d6e67ddfc55db46573f4e (diff) | |
| download | vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.gz vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.bz2 vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/util/pl')
| -rw-r--r-- | openssl/util/pl/VC-32.pl | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl index c024f0268..9461d1a25 100644 --- a/openssl/util/pl/VC-32.pl +++ b/openssl/util/pl/VC-32.pl @@ -123,15 +123,15 @@ else # Win32 } $mlflags=''; -$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); -$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); +$out_def ="\$(OUT_D)"; $out_def.="dll" if ($shlib); + $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); +$tmp_def ="\$(TMP_D)"; $tmp_def.="dll" if ($shlib); + $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/); $inc_def="inc32"; if ($debug) { $cflags=$dbg_cflags.$base_cflags; - $lflags.=" /debug"; - $mlflags.=' /debug'; } else { @@ -139,6 +139,11 @@ else $cdflags=$dbg_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'; $asm_suffix='.asm'; $ofile="/Fo"; @@ -179,18 +184,15 @@ $lfile='/out:'; $shlib_ex_obj=""; $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/); if ($FLAVOR =~ /WIN64A/) { - if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { - $asm='nasm -f win64 -DNEAR -Ox'; - $asm.=' -g' if $debug; + if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { + $asm='nasm -f win64 -DNEAR -Ox -g'; $afile='-o '; } else { - $asm='ml64 /c /Cp /Cx'; - $asm.=" /Zi" if $debug; + $asm='ml64 /c /Cp /Cx /Zi'; $afile='/Fo'; } } elsif ($FLAVOR =~ /WIN64I/) { - $asm='ias'; - $asm.=" -d debug" if $debug; + $asm='ias -d debug'; $afile="-o "; } elsif ($nasm) { my $ver=`nasm -v 2>NUL`; @@ -200,8 +202,7 @@ if ($FLAVOR =~ /WIN64A/) { $asmtype="win32n"; $afile='-o '; } else { - $asm='ml /nologo /Cp /coff /c /Cx'; - $asm.=" /Zi" if $debug; + $asm='ml /nologo /Cp /coff /c /Cx /Zi'; $afile='/Fo'; $asmtype="win32"; } @@ -234,9 +235,7 @@ if (!$no_asm) if ($shlib && $FLAVOR !~ /CE/) { $mlflags.=" $lflags /dll"; - $lib_cflag=" -D_WINDLL"; - $out_def="out32dll"; - $tmp_def="tmp32dll"; + $lib_cflag.=" -D_WINDLL"; # # Engage Applink... # @@ -266,14 +265,9 @@ elsif ($shlib && $FLAVOR =~ /CE/) { $mlflags.=" $lflags /dll"; $lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'})); - $lib_cflag=" -D_WINDLL -D_DLL"; - $out_def='out32dll_$(TARGETCPU)'; - $tmp_def='tmp32dll_$(TARGETCPU)'; + $lib_cflag.=" -D_WINDLL -D_DLL"; } -$cflags.=" /Fd\$(OUT_D)"; -$cdflags.=" /Fd\$(OUT_D)"; - sub do_lib_rule { local($objs,$target,$name,$shlib)=@_; |