diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2019-03-22 13:55:07 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2019-03-22 14:04:33 +0800 |
| commit | f09ec7ce253b0f14d63c7a78c558d54672eba724 (patch) | |
| tree | e837396b0bd9b23023b58cf6e84dc4c4e7055132 | |
| parent | ac02454d4c3859729fbf5c6eb72497b0b02c30d2 (diff) | |
| download | dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar.gz dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar.bz2 dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar.lz dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar.xz dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.tar.zst dexon-bls-f09ec7ce253b0f14d63c7a78c558d54672eba724.zip | |
bls384_256 supports windows
| -rw-r--r-- | include/bls/bls.h | 4 | ||||
| -rw-r--r-- | mk.bat | 1 | ||||
| -rw-r--r-- | mklib.bat | 4 | ||||
| -rw-r--r-- | test/bls_c_test.hpp | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/include/bls/bls.h b/include/bls/bls.h index 79aa6a3..cb300bc 100644 --- a/include/bls/bls.h +++ b/include/bls/bls.h @@ -29,7 +29,9 @@ #ifndef BLS_NO_AUTOLINK #if MCLBN_FP_UNIT_SIZE == 4 #pragma comment(lib, "bls256.lib") - #elif MCLBN_FP_UNIT_SIZE == 6 + #elif (MCLBN_FP_UNIT_SIZE == 6) && (MCLBN_FR_UNIT_SIZE == 4) + #pragma comment(lib, "bls384_256.lib") + #elif (MCLBN_FP_UNIT_SIZE == 6) && (MCLBN_FR_UNIT_SIZE == 6) #pragma comment(lib, "bls384.lib") #endif #endif @@ -8,6 +8,7 @@ if "%1"=="-s" ( echo "mk (-s|-d) <source file>" goto exit ) +set CFLAGS=%CFLAGS% -I../mcl/include set SRC=%2 set EXE=%SRC:.cpp=.exe% set EXE=%EXE:.c=.exe% @@ -10,13 +10,17 @@ call setvar.bat if "%1"=="dll" ( 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/bls_c384_256.obj src/bls_c384_256.cpp /DBLS_NO_AUTOLINK cl /c %CFLAGS% /Foobj/fp.obj ../mcl/src/fp.cpp 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 + link /nologo /DLL /OUT:bin\bls384_256.dll obj\bls_c384_256.obj obj\fp.obj %LDFLAGS% /implib:lib\bls384_256.lib ) else ( 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/bls_c384_256.obj src/bls_c384_256.cpp cl /c %CFLAGS% /Foobj/fp.obj ../mcl/src/fp.cpp /DMCLBN_DONT_EXPORT 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% + lib /OUT:lib/bls384_256.lib /nodefaultlib obj/bls_c384_256.obj obj/fp.obj %LDFLAGS% ) diff --git a/test/bls_c_test.hpp b/test/bls_c_test.hpp index 274cbd7..e9b6e63 100644 --- a/test/bls_c_test.hpp +++ b/test/bls_c_test.hpp @@ -3,7 +3,7 @@ #include <bls/bls.h> #include <string.h> #include <cybozu/benchmark.hpp> -#include <gmpxx.h> +#include <mcl/gmp_util.hpp> size_t pubSize(size_t FrSize) { |