VC-32.pl: default to nasm if neither nasm or nasmw is is found at the moment [from...
authorAndy Polyakov <appro@openssl.org>
Mon, 13 Sep 2010 16:29:00 +0000 (16:29 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 13 Sep 2010 16:29:00 +0000 (16:29 +0000)
PR: 2338

util/pl/VC-32.pl

index c3e29fda965c0cf57a4edc4d74b36303486ad95e..5f25fc41bfa7bf9936b4b33ce2fbda4733edbffa 100644 (file)
@@ -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 {