mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-12-20 10:55:37 -05:00
f2b23348d7
* feat: use contrib/depends to build dependencies * fix: bump min iOS sdk to 13 * fix: macos targets * fix: show make output during build fix: mingw linking issues * chore: address AI review * check target only once, stream make output to stdout, init ios project * check whether patch is already applied before trying again * copy contrib/depends to target dir and build dependencies there * fix: use proper triplet for ios-sim * fix(dprint): ignore monero_c, monero and monero-seed folders * fix(swap): Missing import * fix(ci): Add gperf as a required dependency for Linux * add notes for unsafe usage to CLAUDE.md * add clean command to justfile * fix: minimumSystemVersion to 11.0 because tauri doesn't default behavior is wild * update crunchy dependency to fix linux->windows cross compilation issue * fix last commit * link c++ std lib and libgcc statically on windows * embed WebView2 Bootstrapper * disable ccache on ios, update tauri deps, set minimumSystemVersion to 13.0 * fix * fix: build env leaking into contrib/depends * fix: version '-sim' in target triple 'arm64-apple-ios13.0-simulator-sim' is invalid * get it working on ios * Upgrade to nightly Rust toolchain for unstable features - Change from Rust 1.85 to nightly to support yamux unstable features - This resolves the unsigned_is_multiple_of compilation error * fix * WINDOWS WORKS * Cargo.lock update * android progress * progress on gcc build script * remove windows binary dependencies from git, running just prepare-windows-build will re-create them * check for .dll's in src-tauri/build.rs and give hint how to build them * document new build requirement * add verification to gcc build script and error message when building windows from os other than linux * fix windows build * add just command for building windows ss * fix script: remove sudo, copy dlls when finished * move path setup to its own function * fix * try and fix ci * extract setup to single action * clean up ci * add actions/checkout everywhere * fix missing input prefix * fix missing autoconf * fix add build deps to env * fix add build deps to env * add deps for cross building windows * fix action call * only bundle dll's on windows * use ubuntu-latest, install yarn, don't use swap * add build dependencies, remove no longer existing docker test * add aclocal to macos setup * include macos build depends * change platform -> host for setup-build-environment, use matrix for building binaries for all platforms * fix: prepare build env for docker for ubuntu, don't get host value from matrix * manually install rust target * include openssl on ubuntu for sqlx * build cargo cache once before building individual tests * only manually install target if provided * fix: don't need special syntax for variables in if condition * fix libssl problem by upgrading sqlx cli * fix: specify host for prepare_docker_tests * a lot of fixes --------- Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net> Co-authored-by: einliterflasche <einliterflasche@pm.me> Co-authored-by: binarybaron <you@example.com> Co-authored-by: Raphael <81313171+Einliterflasche@users.noreply.github.com>
38 lines
No EOL
1.1 KiB
Diff
38 lines
No EOL
1.1 KiB
Diff
From 6d9116c6d57d72f9bab5d28740209ffdefc9d197 Mon Sep 17 00:00:00 2001
|
|
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
|
|
Date: Mon, 18 Nov 2024 10:57:37 -0500
|
|
Subject: [PATCH] include locale only when targeting WIN32
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 46bd5eb1b..d5cfecf39 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1085,7 +1085,11 @@ 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)
|
|
+ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options)
|
|
+
|
|
+ if(WIN32)
|
|
+ list(APPEND BOOST_COMPONENTS locale)
|
|
+ endif()
|
|
|
|
# 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 96393eaaa..b6f527ae5 100644
|
|
--- a/src/wallet/api/wallet.cpp
|
|
+++ b/src/wallet/api/wallet.cpp
|
|
@@ -48,7 +48,10 @@
|
|
#include <sstream>
|
|
#include <unordered_map>
|
|
|
|
+#ifdef WIN32
|
|
#include <boost/locale.hpp>
|
|
+#endif
|
|
+
|
|
#include <boost/filesystem.hpp>
|
|
|
|
using namespace std;
|