diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2025-02-11 15:00:46 +0100 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2025-02-11 15:00:46 +0100 |
| commit | 0bfe086f4014c0a9f3fde68dcb9a95f4c14ff1a0 (patch) | |
| tree | 0481366258de23fc326b80d50be0f36607bfa75f | |
| parent | 09c6d2e5f8ae8e9f4c5efe5b7bfe72911462a32b (diff) | |
FIx ledger issue (https://github.com/cake-tech/cake_wallet/issues/2007)
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 3 | ||||
| -rw-r--r-- | patches/monero/0007-add-dummy-device-for-ledger.patch | 2 | ||||
| -rw-r--r-- | patches/wownero/0008-add-dummy-device-for-ledger.patch | 2 |
3 files changed, 5 insertions, 2 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..b8dbfd3 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); diff --git a/patches/wownero/0008-add-dummy-device-for-ledger.patch b/patches/wownero/0008-add-dummy-device-for-ledger.patch index 679bce2..94a5aea 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); |