Commit e011160f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

PR: 2338
parent 9447da50

util/pl/VC-32.pl

+3 −3
Changes for util/pl/VC-32.pl: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ else 
	}



# generate symbols.pdb unconditionally

$app_cflag.=" /Zi /Fd$tmp_def/app";

$lib_cflag.=" /Zi /Fd$tmp_def/lib";

$app_cflag.=" /Zi /Fd\$(TMP_D)/app";

$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";

$lflags.=" /debug";



$obj='.obj';
@@ -195,7 +195,7 @@ if ($FLAVOR =~ /WIN64A/) { 
	my $ver=`nasm -v 2>NUL`;

	my $vew=`nasmw -v 2>NUL`;

	# pick newest version

	$asm=($ver gt $vew?"nasm":"nasmw")." -f win32";

	$asm=($ver ge $vew?"nasm":"nasmw")." -f win32";

	$asmtype="win32n";

	$afile='-o ';

} else {