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

VC-32.pl: default to nasm if neither nasm or nasmw is is found at the moment [from HEAD].

Browse Source 
PR: 2338
This commit is contained in:
Andy Polyakov 2010-09-13 16:29:00 +00:00
parent 9447da5065
commit e011160f3c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,8 +138,8 @@ else
} }
# generate symbols.pdb unconditionally # generate symbols.pdb unconditionally
$app_cflag.=" /Zi /Fd$tmp_def/app"; $app_cflag.=" /Zi /Fd\$(TMP_D)/app";
$lib_cflag.=" /Zi /Fd$tmp_def/lib"; $lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
$lflags.=" /debug"; $lflags.=" /debug";
$obj='.obj'; $obj='.obj';
@ -195,7 +195,7 @@ if ($FLAVOR =~ /WIN64A/) {
my $ver=`nasm -v 2>NUL`; my $ver=`nasm -v 2>NUL`;
my $vew=`nasmw -v 2>NUL`; my $vew=`nasmw -v 2>NUL`;
# pick newest version # pick newest version
$asm=($ver gt $vew?"nasm":"nasmw")." -f win32"; $asm=($ver ge $vew?"nasm":"nasmw")." -f win32";
$asmtype="win32n"; $asmtype="win32n";
$afile='-o '; $afile='-o ';
} else { } else {