diff --git a/ms/do_masm.bat b/ms/do_masm.bat index 61c52562f7..ce22a44305 100755 --- a/ms/do_masm.bat +++ b/ms/do_masm.bat @@ -1,4 +1,3 @@ -rem use "fips" as the first argument to make a proper FIPS build. @echo off echo Generating x86 for MASM assember @@ -60,7 +59,7 @@ echo on perl util\mkfiles.pl >MINFO rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak -perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak +rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak diff --git a/ms/do_ms.bat b/ms/do_ms.bat index 72179708bf..4a76921298 100755 --- a/ms/do_ms.bat +++ b/ms/do_ms.bat @@ -2,7 +2,7 @@ perl util\mkfiles.pl >MINFO rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak -perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak +rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak perl util\mk1mf.pl no-asm %1 VC-WIN32 >ms\nt.mak perl util\mk1mf.pl dll no-asm %1 VC-WIN32 >ms\ntdll.mak perl util\mk1mf.pl no-asm %1 VC-CE >ms\ce.mak diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 96889929b6..813aa08745 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -120,10 +120,10 @@ sub do_lib_rule # $target="\$(LIB_D)$o$target"; - $ret.="$target: $objs\n"; if (!$shlib) { # $ret.="\t\$(RM) \$(O_$Name)\n"; + $ret.="$target: $objs\n"; $ex =' advapi32.lib'; $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; } @@ -134,6 +134,7 @@ sub do_lib_rule $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; if (defined $fips_get_sig) { + $ret.="$target: $objs $fips_get_sig\n"; $ret.="\tSET FIPS_LINK=\$(LINK)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n"; $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c \$(SRC_D)${o}fips${o}fips_premain.c\n"; @@ -145,6 +146,7 @@ sub do_lib_rule } else { + $ret.="$target: $objs\n"; $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; } }