move MCL_STATIC_CODE flag to common.mk

update-fork
MITSUNARI Shigeo 4 years ago
parent 512a0abd44
commit 0e64636878
  1. 3
      Makefile
  2. 5
      common.mk

@ -13,9 +13,6 @@ TEST_SRC+=ecdsa_c_test.cpp
TEST_SRC+=modp_test.cpp TEST_SRC+=modp_test.cpp
LIB_OBJ=$(OBJ_DIR)/fp.o LIB_OBJ=$(OBJ_DIR)/fp.o
ifeq ($(MCL_STATIC_CODE),1) ifeq ($(MCL_STATIC_CODE),1)
MCL_USE_XBYAK=0
MCL_MAX_BIT_SIZE=384
CFLAGS+=-DMCL_STATIC_CODE
LIB_OBJ+=obj/static_code.o LIB_OBJ+=obj/static_code.o
TEST_SRC=bls12_test.cpp TEST_SRC=bls12_test.cpp
endif endif

@ -127,6 +127,11 @@ endif
ifeq ($(MCL_USE_OPENSSL),1) ifeq ($(MCL_USE_OPENSSL),1)
OPENSSL_LIB=-lcrypto OPENSSL_LIB=-lcrypto
endif endif
ifeq ($(MCL_STATIC_CODE),1)
MCL_USE_XBYAK=0
MCL_MAX_BIT_SIZE=384
CFLAGS+=-DMCL_STATIC_CODE
endif
LDFLAGS+=$(GMP_LIB) $(OPENSSL_LIB) $(BIT_OPT) $(LDFLAGS_USER) LDFLAGS+=$(GMP_LIB) $(OPENSSL_LIB) $(BIT_OPT) $(LDFLAGS_USER)
CFLAGS+=-fPIC CFLAGS+=-fPIC

Loading…
Cancel
Save