fix mk.bat and mklib.bat and update readme.md for windows

dev
MITSUNARI Shigeo 6 years ago
parent d1532bf05a
commit 1ee20123f6
  1. 17
      mk.bat
  2. 28
      mklib.bat
  3. 15
      readme.md

@ -1,9 +1,20 @@
@echo off @echo off
call setvar.bat call setvar.bat
set SRC=%1 if "%1"=="-s" (
echo use static lib
set CFLAGS=%CFLAGS% /DMCLBN_DONT_EXPORT
) else if "%1"=="-d" (
echo use dynamic lib
) else (
echo "mk (-s|-d) <source file>"
goto exit
)
set SRC=%2
set EXE=%SRC:.cpp=.exe% set EXE=%SRC:.cpp=.exe%
set EXE=%EXE:.c=.exe% set EXE=%EXE:.c=.exe%
set EXE=%EXE:test\=bin\% set EXE=%EXE:test\=bin\%
set EXE=%EXE:sample\=bin\% set EXE=%EXE:sample\=bin\%
echo cl %CFLAGS% %1 %2 %3 /Fe:%EXE% /link %LDFLAGS% echo cl %CFLAGS% %2 /Fe:%EXE% /link %LDFLAGS%
cl %CFLAGS% %1 %2 %3 /Fe:%EXE% /link %LDFLAGS% cl %CFLAGS% %2 /Fe:%EXE% /link %LDFLAGS%
:exit

@ -1,5 +1,10 @@
@echo off @echo off
call setvar.bat call setvar.bat
if "%1"=="dll" (
echo make dynamic library DLL
) else (
echo make static library LIB
)
rem nasm -f win64 -D_WIN64 src\asm\low_x86-64.asm rem nasm -f win64 -D_WIN64 src\asm\low_x86-64.asm
rem lib /OUT:lib\mcl.lib /nodefaultlib fp.obj src\asm\low_x86-64.obj rem lib /OUT:lib\mcl.lib /nodefaultlib fp.obj src\asm\low_x86-64.obj
@ -8,17 +13,22 @@ echo cl /c %CFLAGS% src\fp.cpp /Foobj\fp.obj
echo lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj echo lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj
lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj
echo cl /c %CFLAGS% src\bn_c256.cpp /Foobj\bn_c256.obj if "%1"=="dll" (
cl /c %CFLAGS% src\bn_c256.cpp /Foobj\bn_c256.obj echo cl /c %CFLAGS% src\she_c256.cpp /Foobj\she_c256.obj
echo link /nologo /DLL /OUT:bin\mclbn256.dll obj\bn_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn256.lib cl /c %CFLAGS% src\she_c256.cpp /Foobj\she_c256.obj /DMCLBN_NO_AUTOLINK
link /nologo /DLL /OUT:bin\mclbn256.dll obj\bn_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn256.lib echo link /nologo /DLL /OUT:bin\mclbn256.dll obj\she_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclshe256.lib
link /nologo /DLL /OUT:bin\mclbn256.dll obj\she_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclshe256.lib
echo cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj echo cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj
cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj /DMCLBN_NO_AUTOLINK
echo link /nologo /DLL /OUT:bin\mclbn384.dll obj\bn_c384.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn384.lib echo link /nologo /DLL /OUT:bin\mclbn384.dll obj\bn_c384.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn384.lib
link /nologo /DLL /OUT:bin\mclbn384.dll obj\bn_c384.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn384.lib link /nologo /DLL /OUT:bin\mclbn384.dll obj\bn_c384.obj obj\fp.obj %LDFLAGS% /implib:lib\mclbn384.lib
) else (
echo cl /c %CFLAGS% src\bn_c256.cpp /Foobj\bn_c256.obj
cl /c %CFLAGS% src\bn_c256.cpp /Foobj\bn_c256.obj
lib /nologo /OUT:lib\mclbn256.lib /nodefaultlib obj\bn_c256.obj lib\mcl.lib
echo cl /c %CFLAGS% src\she_c256.cpp /Foobj\she_c256.obj echo cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj
cl /c %CFLAGS% src\she_c256.cpp /Foobj\she_c256.obj cl /c %CFLAGS% src\bn_c384.cpp /Foobj\bn_c384.obj
echo link /nologo /DLL /OUT:bin\mclbn256.dll obj\she_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclshe256.lib lib /nologo /OUT:lib\mclbn384.lib /nodefaultlib obj\bn_c384.obj lib\mcl.lib
link /nologo /DLL /OUT:bin\mclbn256.dll obj\she_c256.obj obj\fp.obj %LDFLAGS% /implib:lib\mclshe256.lib )

@ -114,14 +114,19 @@ make ARCH=x86 CFLAGS_USER="-I <lib32>/include" LDFLAGS_USER="-L <lib32>/lib -Wl,
``` ```
## Build for 64-bit Windows ## Build for 64-bit Windows
1) make library 1) make static library and use it
``` ```
mklib.bat mklib
mk -s test\bn_c256_test.cpp
bin\bn_c256_test.exe
``` ```
2) make exe binary of sample\pairing.cpp 2) make dynamic library and use it
``` ```
mk sample\pairing.cpp mklib dll
bin/bn_test.exe mk -d test\bn_c256_test.cpp
bin\bn_c256_test.exe
``` ```
open mcl.sln and build or if you have msbuild.exe open mcl.sln and build or if you have msbuild.exe

Loading…
Cancel
Save