From 04e4db076e72a2c73cddeee5d005dc328fc6813a Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Sat, 15 Sep 2018 22:51:15 +0900 Subject: fix bat for win --- mklib.bat | 12 ++++++++---- setvar.bat | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mklib.bat b/mklib.bat index a7e5c33..fca9333 100644 --- a/mklib.bat +++ b/mklib.bat @@ -8,11 +8,15 @@ if "%1"=="dll" ( call setvar.bat if "%1"=="dll" ( - cl /c %CFLAGS% /Foobj/bls_c.obj src/bls_c.cpp /DBLS_NO_AUTOLINK + cl /c %CFLAGS% /Foobj/bls_c256.obj src/bls_c256.cpp /DBLS_NO_AUTOLINK + cl /c %CFLAGS% /Foobj/bls_c384.obj src/bls_c384.cpp /DBLS_NO_AUTOLINK cl /c %CFLAGS% /Foobj/fp.obj ../mcl/src/fp.cpp - link /nologo /DLL /OUT:bin\bls384.dll obj\bls_c.obj obj\fp.obj %LDFLAGS% /implib:lib\bls384.lib + link /nologo /DLL /OUT:bin\bls256.dll obj\bls_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\bls256.lib + link /nologo /DLL /OUT:bin\bls384.dll obj\bls_c384.obj obj\fp.obj %LDFLAGS% /implib:lib\bls384.lib ) else ( - cl /c %CFLAGS% /Foobj/bls_c.obj src/bls_c.cpp + cl /c %CFLAGS% /Foobj/bls_c256.obj src/bls_c256.cpp + cl /c %CFLAGS% /Foobj/bls_c384.obj src/bls_c384.cpp cl /c %CFLAGS% /Foobj/fp.obj ../mcl/src/fp.cpp /DMCLBN_DONT_EXPORT - lib /OUT:lib/bls384.lib /nodefaultlib obj/bls_c.obj obj/fp.obj %LDFLAGS% + lib /OUT:lib/bls256.lib /nodefaultlib obj/bls_c256.obj obj/fp.obj %LDFLAGS% + lib /OUT:lib/bls384.lib /nodefaultlib obj/bls_c384.obj obj/fp.obj %LDFLAGS% ) diff --git a/setvar.bat b/setvar.bat index 5e1a1c3..b45af24 100755 --- a/setvar.bat +++ b/setvar.bat @@ -1,7 +1,6 @@ @echo off call ..\mcl\setvar.bat -set MCLBN_FP_UNIT_SIZE=6 -set CFLAGS=%CFLAGS% /DMCLBN_FP_UNIT_SIZE=%MCLBN_FP_UNIT_SIZE% /I ..\mcl\include /I .\ +set CFLAGS=%CFLAGS% /I ..\mcl\include /I .\ set LDFLAGS=%LDFLAGS% /LIBPATH:..\mcl\lib echo CFLAGS=%CFLAGS% echo LDFLAGS=%LDFLAGS% \ No newline at end of file -- cgit v1.2.3