From 5eb7485a01fad37357aa15e08a2fd7f54764fc9d Mon Sep 17 00:00:00 2001 From: Douglas Stebila Date: Wed, 6 Feb 2019 21:14:10 -0500 Subject: [PATCH] Fix Windows build for dilithium-iii --- .../clean/Makefile.Microsoft_nmake | 2 +- scripts_windows/build_all.bat | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake index 6a631ae4..6b79e019 100644 --- a/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake +++ b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake @@ -1,6 +1,6 @@ LIB=libdilithium-iii_clean.lib -OBJECTS=ntt.c packing.c poly.c polyvec.c reduce.c rounding.c sign.c +OBJECTS=ntt.obj packing.obj poly.obj polyvec.obj reduce.obj rounding.obj sign.obj CFLAGS=/I ..\..\..\common /W1 /WX diff --git a/scripts_windows/build_all.bat b/scripts_windows/build_all.bat index 19c4ff87..5b3b3bb2 100644 --- a/scripts_windows/build_all.bat +++ b/scripts_windows/build_all.bat @@ -5,16 +5,14 @@ SET EL=0 REM CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" REM IF ERRORLEVEL 1 SET EL=1 -FOR /D %%J IN (crypto_kem, crypto_sig) DO ( - FOR /D %%K IN (%%J\*) DO ( - FOR /D %%L IN (%%K\*) DO ( - cd %%L - nmake /f Makefile.Microsoft_nmake clean - IF ERRORLEVEL 1 SET EL=2 - nmake /f Makefile.Microsoft_nmake - IF ERRORLEVEL 1 SET EL=3 - cd ..\..\.. - ) +FOR /D %%K IN (crypto_kem\* crypto_sign\*) DO ( + FOR /D %%L IN (%%K\*) DO ( + cd %%L + nmake /f Makefile.Microsoft_nmake clean + IF ERRORLEVEL 1 SET EL=2 + nmake /f Makefile.Microsoft_nmake + IF ERRORLEVEL 1 SET EL=3 + cd ..\..\.. ) )