Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ os:
- linux

env:
- ENV="-DBUILD_TYPE=test -DUSE_UECC_LIB=ON" TEST=yes
- ENV="-DBUILD_TYPE=test -DUSE_UECC_LIB=OFF" TEST=yes
- ENV="-DBUILD_TYPE=firmware -DUSE_UECC_LIB=ON" TEST=no
- ENV="-DBUILD_TYPE=bootloader -DUSE_UECC_LIB=ON" TEST=no
# - ENV="-DBUILD_TYPE=firmware -DUSE_UECC_LIB=OFF" TEST=no # secp lib too big at the moment
- ENV="-DBUILD_TYPE=test -DUSE_UECC_LIB=ON" TEST=yes
- ENV="-DBUILD_TYPE=test -DUSE_UECC_LIB=OFF" TEST=yes
- ENV="-DBUILD_TYPE=bootloader -DUSE_UECC_LIB=ON" TEST=no # use the smaller ecc lib
- ENV="-DBUILD_TYPE=firmware -DUSE_UECC_LIB=OFF" TEST=no
# - ENV="-DBUILD_TYPE=firmware -DUSE_UECC_LIB=ON" TEST=no

compiler:
- clang
Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ project(${MYPROJECT} C)
#-----------------------------------------------------------------------------
# Options for building

if(BUILD_TYPE STREQUAL "bootloader")
option(USE_UECC_LIB "Use micro ECC instead bitcoin's secp256k1 library." ON)
else()
option(USE_UECC_LIB "Use micro ECC instead bitcoin's secp256k1 library." OFF)
endif()
option(BUILD_COVERAGE "Compile with test coverage flags." OFF)
option(BUILD_VALGRIND "Compile with debug symbols." OFF)
option(BUILD_DOCUMENTATION "Build the Doxygen documentation." OFF)
Expand Down Expand Up @@ -90,6 +94,8 @@ endif()

if(USE_UECC_LIB)
add_definitions(-DECC_USE_UECC_LIB)
else()
add_definitions(-DSECP256K1_BUILD=1)
endif()


Expand Down
2 changes: 1 addition & 1 deletion src/secp256k1