diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2018-12-13 10:45:32 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2018-12-13 10:45:32 +0800 |
| commit | 7a36e06984f98153e8b27f5d82603fb7d1227cc8 (patch) | |
| tree | 6832b401881d1b7508d8ef908fa5d901781d2419 | |
| parent | 08c1906ecf95ea18663593df94aadec538dbb715 (diff) | |
| download | dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar.gz dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar.bz2 dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar.lz dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar.xz dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.tar.zst dexon-bls-7a36e06984f98153e8b27f5d82603fb7d1227cc8.zip | |
bn_c_impl.hpp is in public
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | setvar.bat | 4 | ||||
| -rw-r--r-- | src/bls_c_impl.hpp | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31130fb..8371a0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,10 +7,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(LIBS mcl gmp gmpxx crypto pthread) -set(MCL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../mcl/" CACHE PATH "mcl source dir") -include_directories( - ${MCL_DIR}/src ./include/ -) +include_directories(include/) add_library(bls_c256 SHARED src/bls_c256.cpp) add_library(bls_c384 SHARED src/bls_c384.cpp) @@ -10,7 +10,7 @@ SRC_SRC=bls_c256.cpp bls_c384.cpp bls_c384_256.cpp TEST_SRC=bls256_test.cpp bls384_test.cpp bls384_256_test.cpp bls_c256_test.cpp bls_c384_test.cpp bls_c384_256_test.cpp SAMPLE_SRC=bls256_smpl.cpp bls384_smpl.cpp -CFLAGS+=-I$(MCL_DIR)/include -I./ -I$(MCL_DIR)/src +CFLAGS+=-I$(MCL_DIR)/include ifneq ($(MCL_MAX_BIT_SIZE),) CFLAGS+=-DMCL_MAX_BIT_SIZE=$(MCL_MAX_BIT_SIZE) endif @@ -1,6 +1,6 @@ @echo off call ..\mcl\setvar.bat -set CFLAGS=%CFLAGS% /I ..\mcl\include /I .\ /I../mcl/src +set CFLAGS=%CFLAGS% /I ..\mcl\include /I ./ set LDFLAGS=%LDFLAGS% /LIBPATH:..\mcl\lib echo CFLAGS=%CFLAGS% -echo LDFLAGS=%LDFLAGS%
\ No newline at end of file +echo LDFLAGS=%LDFLAGS% diff --git a/src/bls_c_impl.hpp b/src/bls_c_impl.hpp index dc4c998..46b3aad 100644 --- a/src/bls_c_impl.hpp +++ b/src/bls_c_impl.hpp @@ -4,7 +4,7 @@ #include <bls/bls.h> #if 1 -#include "bn_c_impl.hpp" +#include "mcl/impl/bn_c_impl.hpp" #else #if MCLBN_FP_UNIT_SIZE == 4 && MCLBN_FR_UNIT_SIZE == 4 #include <mcl/bn256.hpp> |