From f09ec7ce253b0f14d63c7a78c558d54672eba724 Mon Sep 17 00:00:00 2001
From: MITSUNARI Shigeo <herumi@nifty.com>
Date: Fri, 22 Mar 2019 14:55:07 +0900
Subject: bls384_256 supports windows

---
 include/bls/bls.h   | 4 +++-
 mk.bat              | 1 +
 mklib.bat           | 4 ++++
 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
diff --git a/mk.bat b/mk.bat
index c5dfac9..9bf8dd9 100644
--- a/mk.bat
+++ b/mk.bat
@@ -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%
diff --git a/mklib.bat b/mklib.bat
index fca9333..4a60d71 100644
--- a/mklib.bat
+++ b/mklib.bat
@@ -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)
 {
-- 
cgit v1.2.3