b4c3fbacab
* update wownero to 0.11.3.0 * Updated wownero, cleaned up patches * unshallow zano * Fix ios builds * Update checksum
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From eeb059ab8bff7e8614531565259ca66f6e6a8c7d Mon Sep 17 00:00:00 2001
|
|
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
|
|
Date: Mon, 18 Nov 2024 10:57:37 -0500
|
|
Subject: [PATCH 15/15] include locale only when targeting WIN32
|
|
|
|
---
|
|
CMakeLists.txt | 5 ++++-
|
|
src/wallet/api/wallet.cpp | 2 ++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b8782570d..d1ed1de7b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1090,7 +1090,10 @@ if(NOT Boost_FOUND)
|
|
elseif(Boost_FOUND)
|
|
message(STATUS "Found Boost Version: ${Boost_VERSION_STRING}")
|
|
|
|
- set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options locale)
|
|
+ if(WIN32)
|
|
+ set(BOOST_LOCALE locale)
|
|
+ endif()
|
|
+ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options ${BOOST_LOCALE})
|
|
|
|
# Boost System is header-only since 1.69
|
|
if (Boost_VERSION_STRING VERSION_LESS 1.69.0)
|
|
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
|
|
index e650e6044..6d7553a1d 100644
|
|
--- a/src/wallet/api/wallet.cpp
|
|
+++ b/src/wallet/api/wallet.cpp
|
|
@@ -46,7 +46,9 @@
|
|
#include <sstream>
|
|
#include <unordered_map>
|
|
|
|
+#ifdef WIN32
|
|
#include <boost/locale.hpp>
|
|
+#endif
|
|
#include <boost/filesystem.hpp>
|
|
#include "bc-ur/src/bc-ur.hpp"
|
|
#if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI)
|
|
--
|
|
2.48.0
|
|
|