From be93c7f62133a956a32ece8715f9e87f1a5a974b Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Mon, 18 Aug 2025 23:05:07 +0300 Subject: [PATCH] Fix linux build --- Common/3dParty/icu/icu.pri | 2 +- UnicodeConverter/UnicodeConverter.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri index c5ae929f8a..2ca098bbc9 100644 --- a/Common/3dParty/icu/icu.pri +++ b/Common/3dParty/icu/icu.pri @@ -1,4 +1,4 @@ -ICU_MAJOR_VER = 58 +ICU_MAJOR_VER = 74 core_windows { exists($$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu) { diff --git a/UnicodeConverter/UnicodeConverter.cpp b/UnicodeConverter/UnicodeConverter.cpp index 18f312dff7..1a4ebeea40 100644 --- a/UnicodeConverter/UnicodeConverter.cpp +++ b/UnicodeConverter/UnicodeConverter.cpp @@ -37,8 +37,6 @@ #include "unicode/ucnv.h" /* C Converter API */ #include "unicode/usprep.h" -//#include "../DesktopEditor/common/File.h" - #if !defined (_WIN32) && !defined (_WIN64) #if defined (_LINUX) && !defined(__ANDROID__) && !defined(_IOS) && !defined(_MAC) #define USE_ICONV @@ -48,6 +46,14 @@ #include #endif +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + std::string g_overrideIcuDataPath = ""; namespace NSUnicodeConverter