NASM has recently changed name of win32 pre-compiled binary.
authorAndy Polyakov <appro@openssl.org>
Thu, 3 Jan 2008 17:09:56 +0000 (17:09 +0000)
committerAndy Polyakov <appro@openssl.org>
Thu, 3 Jan 2008 17:09:56 +0000 (17:09 +0000)
PR: 1627

util/pl/VC-32.pl

index dfde1aa..f335a0a 100644 (file)
@@ -163,7 +163,10 @@ $lfile='/out:';
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
 if ($nasm) {
-       $asm='nasmw -f win32';
+       my $ver=`nasm -v`;
+       my $vew=`nasmw -v`;
+       # pick newest version
+       $asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
        $afile='-o ';
 } else {
        $asm='ml /Cp /coff /c /Cx';