diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2018-05-24 20:14:41 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2018-05-24 20:14:41 +0800 |
| commit | b0249247f4aee3fd292fb177f3504c2042701dfc (patch) | |
| tree | d40cda2730a7c89e1fb7a3b54b9fb1e558fea444 | |
| parent | 6b889517c31bb773e4ad1cb8c139c5d924520c2e (diff) | |
| download | dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar.gz dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar.bz2 dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar.lz dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar.xz dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.tar.zst dexon-bls-b0249247f4aee3fd292fb177f3504c2042701dfc.zip | |
use same options of mcl-wasm
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | src/bls_c.cpp | 9 |
2 files changed, 7 insertions, 9 deletions
@@ -89,14 +89,15 @@ test_go: ffi/go/bls/bls.go ffi/go/bls/bls_test.go $(BLS384_SLIB) cd ffi/go/bls && ln -sf ../../../lib . && env LD_RUN_PATH="../../../lib" CGO_CFLAGS="-I../../../include -I../../../../mcl/include" CGO_LDFLAGS="-L../../../lib -L../../../mcl/lib" go test $(MAC_GO_LDFLAGS) . EMCC_OPT=-I./include -I./src -I../cybozulib/include -I../mcl/include -I./ -Wall -Wextra -EMCC_OPT+=-O3 -DNDEBUG -DMCLBN_FP_UNIT_SIZE=6 -DMCL_MAX_BIT_SIZE=384 -Os -EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=1 -s NO_EXIT_RUNTIME=1 -s MODULARIZE=1 +EMCC_OPT+=-O3 -DNDEBUG -Os +EMCC_OPT+=-s WASM=1 -s NO_EXIT_RUNTIME=1 -s MODULARIZE=1 #-s ASSERTIONS=1 EMCC_OPT+=-DCYBOZU_MINIMUM_EXCEPTION EMCC_OPT+=-s ABORTING_MALLOC=0 +EMCC_OPT+=-DMCLBN_FP_UNIT_SIZE=6 JS_DEP=src/bls_c.cpp ../mcl/src/fp.cpp Makefile ../bls-wasm/bls_c.js: $(JS_DEP) - emcc -o $@ src/bls_c.cpp $(EMCC_OPT) + emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -DMCL_MAX_BIT_SIZE=384 -DMCL_USE_WEB_CRYPTO_API -s DISABLE_EXCEPTION_CATCHING=1 bls-wasm: $(MAKE) ../bls-wasm/bls_c.js diff --git a/src/bls_c.cpp b/src/bls_c.cpp index ae86508..d3ad2f5 100644 --- a/src/bls_c.cpp +++ b/src/bls_c.cpp @@ -1,13 +1,10 @@ -#ifdef __EMSCRIPTEN__ #define MCLBN_DONT_EXPORT -#include "../mcl/src/fp.cpp" -#endif - -#include "../mcl/src/bn_c_impl.hpp" - #define BLS_DLL_EXPORT #include <bls/bls.h> + +#include "../mcl/src/bn_c_impl.hpp" + /* BLS signature e : G1 x G2 -> Fp12 |