From 82a243132723ac27a81d689722e94e05e18992a0 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 3 Jan 2008 17:09:56 +0000 Subject: [PATCH 1/1] NASM has recently changed name of win32 pre-compiled binary. PR: 1627 --- util/pl/VC-32.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index dfde1aa2b1..f335a0ac05 100644 --- 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) { - $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'; -- 2.34.1