From a5d50332cad6e9fa7842a56976b5ede5aa96438b Mon Sep 17 00:00:00 2001 From: wowario Date: Tue, 31 Jan 2023 00:15:43 +0300 Subject: [PATCH] trezor support off --- .gitmodules | 1 + CMakeLists.txt | 2 +- Makefile | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5b7d77fb3..97d354a35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,7 @@ path = external/rapidjson url = https://github.com/Tencent/rapidjson [submodule "external/trezor-common"] + active = false path = external/trezor-common url = https://github.com/trezor/trezor-common.git [submodule "external/supercop"] diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f2055a3b..72b5699e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,7 +366,7 @@ if(NOT MANUAL_SUBMODULES) message(STATUS "Checking submodules") check_submodule(external/miniupnp) check_submodule(external/rapidjson) - check_submodule(external/trezor-common) + #check_submodule(external/trezor-common) check_submodule(external/randomwow) check_submodule(external/supercop) endif() diff --git a/Makefile b/Makefile index 8e2389073..ae337a70b 100644 --- a/Makefile +++ b/Makefile @@ -100,11 +100,11 @@ release-test: release-all: mkdir -p $(builddir)/release - cd $(builddir)/release && cmake -D BUILD_TESTS=OFF -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE) + cd $(builddir)/release && cmake -D BUILD_TESTS=OFF -D USE_DEVICE_TREZOR=OFF -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE) release-static: mkdir -p $(builddir)/release - cd $(builddir)/release && cmake -D BUILD_TESTS=OFF -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE) + cd $(builddir)/release && cmake -D BUILD_TESTS=OFF -D USE_DEVICE_TREZOR=OFF -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE) coverage: mkdir -p $(builddir)/debug