From 75e70c096cd08c2a5ff4192335cfac25ac1ef2f3 Mon Sep 17 00:00:00 2001 From: will wade Date: Thu, 18 Jun 2026 23:19:38 +0100 Subject: [PATCH 1/2] I18n: treat Android like iOS/Windows (no-op _() macro) Android, like iOS and Windows, does not have gettext/libintl.h. It uses DasherCore's C API JSON localization (dasher_set_locale) for translated parameter strings, exactly as the Apple and Windows frontends do. Including on Android breaks the build, so add __ANDROID__ to the no-op _()/N_() branch alongside _WIN32 and __APPLE__. This unblocks the Dasher-Android frontend (C-API + JNI), which builds DasherCore with BUILD_CAPI ON for arm64-v8a/x86_64. Signed-off-by: will wade --- src/DasherCore/Common/I18n.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DasherCore/Common/I18n.h b/src/DasherCore/Common/I18n.h index 68348374..8d51af59 100644 --- a/src/DasherCore/Common/I18n.h +++ b/src/DasherCore/Common/I18n.h @@ -20,7 +20,7 @@ #pragma once -#if defined(_WIN32) || defined(__APPLE__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__ANDROID__) #define _(szText) szText #define N_(szText) (szText) From 4aa87ef5c3481fb3ae510a80834375b79c374e50 Mon Sep 17 00:00:00 2001 From: will wade Date: Thu, 18 Jun 2026 23:20:45 +0100 Subject: [PATCH 2/2] UserLocation: drop unused include The header is included but never referenced (no ftime()/struct timeb usage). sys/timeb.h is deprecated and absent on Android NDK, breaking the build. Removing the dead include fixes Android without affecting other platforms. Signed-off-by: will wade --- src/DasherCore/UserLocation.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DasherCore/UserLocation.cpp b/src/DasherCore/UserLocation.cpp index 00a1f189..35a752b1 100644 --- a/src/DasherCore/UserLocation.cpp +++ b/src/DasherCore/UserLocation.cpp @@ -1,6 +1,5 @@ #include "UserLocation.h" -#include #include #include "TimeSpan.h"