diff options
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 3 | ||||
| -rw-r--r-- | patches/monero/0007-add-dummy-device-for-ledger.patch | 4 | ||||
| -rw-r--r-- | patches/wownero/0008-add-dummy-device-for-ledger.patch | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 4fda443..ee982fe 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -105,6 +105,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") add_definitions(-DUSE_DEVICE_TREZOR=OFF) add_definitions(-DHIDAPI_DUMMY=ON) + set(HIDAPI_DUMMY ON) SET(ANDROID TRUE) if(ARCHITECTURE STREQUAL "armv7a") SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a") @@ -132,6 +133,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") set(USE_DEVICE_TREZOR OFF) add_definitions(-DHIDAPI_DUMMY=ON) + set(HIDAPI_DUMMY ON) + add_definitions(-DUSE_DEVICE_LEDGER=ON) SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) else() diff --git a/patches/monero/0007-add-dummy-device-for-ledger.patch b/patches/monero/0007-add-dummy-device-for-ledger.patch index b9e1bea..3a91bb1 100644 --- a/patches/monero/0007-add-dummy-device-for-ledger.patch +++ b/patches/monero/0007-add-dummy-device-for-ledger.patch @@ -86,7 +86,7 @@ index e6cd358..777584c 100644 device_registry::device_registry(){ hw::core::register_all(registry); - #ifdef WITH_DEVICE_LEDGER -+ #if defined(WITH_DEVICE_LEDGER) && !defined(HIDAPI_DUMMY) ++ #if defined(WITH_DEVICE_LEDGER) || defined(HIDAPI_DUMMY) hw::ledger::register_all(registry); #endif atexit(clear_device_registry); @@ -102,7 +102,7 @@ index e6cd358..777584c 100644 MERROR(" - " << sm_pair.first); } - throw std::runtime_error("device not found: " + device_descriptor); -+ throw std::runtime_error("device not found: " + device_descriptor + "\nlalala\n" + ss.str()); ++ throw std::runtime_error("device not found: " + device_descriptor + "\n" + ss.str()); } return *device->second; } diff --git a/patches/wownero/0008-add-dummy-device-for-ledger.patch b/patches/wownero/0008-add-dummy-device-for-ledger.patch index 679bce2..3c7a08f 100644 --- a/patches/wownero/0008-add-dummy-device-for-ledger.patch +++ b/patches/wownero/0008-add-dummy-device-for-ledger.patch @@ -86,7 +86,7 @@ index e6cd358b6..777584c01 100644 device_registry::device_registry(){ hw::core::register_all(registry); - #ifdef WITH_DEVICE_LEDGER -+ #if defined(WITH_DEVICE_LEDGER) && !defined(HIDAPI_DUMMY) ++ #if defined(WITH_DEVICE_LEDGER) || defined(HIDAPI_DUMMY) hw::ledger::register_all(registry); #endif atexit(clear_device_registry); @@ -102,7 +102,7 @@ index e6cd358b6..777584c01 100644 MERROR(" - " << sm_pair.first); } - throw std::runtime_error("device not found: " + device_descriptor); -+ throw std::runtime_error("device not found: " + device_descriptor + "\nlalala\n" + ss.str()); ++ throw std::runtime_error("device not found: " + device_descriptor + "\n" + ss.str()); } return *device->second; } |