NASM has recently changed name of win32 pre-compiled binary.

PR: 1627

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index dfde1aa2b1afa9d043b4b07313d025a3942ef1a7..f335a0ac05f999e790b6fac03a655cfa082a4982 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -163,7 +163,10 @@ $lfile='/out:';
 $shlib_ex_obj="";
 $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
 if ($nasm) {
 $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';
        $afile='-o ';
 } else {
        $asm='ml /Cp /coff /c /Cx';