From f32a2fb49147d76440d0ceb4cee4a3d06961ef82 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Tue, 5 Dec 2017 17:24:40 +0900 Subject: [js] bls-demo is moved to bls-wasm --- Makefile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 51b36ab..a1b014b 100644 --- a/Makefile +++ b/Makefile @@ -87,23 +87,14 @@ test_go: go/bls/bls.go go/bls/bls_test.go $(BLS384_SLIB) EMCC_OPT=-I./include -I./src -I../cybozulib/include -I../mcl/include -I./ EMCC_OPT+=-O3 -DNDEBUG -DMCLBN_FP_UNIT_SIZE=6 -DMCL_MAX_BIT_SIZE=384 -EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s NO_EXIT_RUNTIME=1 --pre-js ffi/js/pre.js -JS_DEP=src/bls_c.cpp ../mcl/src/fp.cpp Makefile ffi/js/pre.js -docs/demo/bls_c.js: $(JS_DEP) - emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -s "MODULARIZE=1" +EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s NO_EXIT_RUNTIME=1 +JS_DEP=src/bls_c.cpp ../mcl/src/fp.cpp Makefile ../bls-wasm/bls_c.js: $(JS_DEP) - emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) - cp docs/demo/bls.js ../bls-wasm/ - -demo: - $(MAKE) docs/demo/bls_c.js - -bls-wasm: - $(MAKE) ../bls-wasm/bls_c.js + emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -s "MODULARIZE=1" clean: - $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_SLIB) docs/demo/bls_c.js docs/demo/bls_c.wasm + $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_SLIB) ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC) DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(ALL_SRC:.cpp=.d)) -- cgit v1.2.3