Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3efcacc
feat: use contrib/depends to build dependencies
MrCyjaneK Jul 15, 2025
1e55a7d
fix: bump min iOS sdk to 13
MrCyjaneK Jul 15, 2025
9b34a75
fix: macos targets
MrCyjaneK Jul 15, 2025
fb1abac
fix: show make output during build
MrCyjaneK Jul 15, 2025
bcc94f3
chore: address AI review
MrCyjaneK Jul 15, 2025
ce4b366
check target only once, stream make output to stdout, init ios project
Einliterflasche Jul 16, 2025
aeef9dc
check whether patch is already applied before trying again
Einliterflasche Jul 16, 2025
5c1d8ea
copy contrib/depends to target dir and build dependencies there
Einliterflasche Jul 16, 2025
5668b63
fix: use proper triplet for ios-sim
MrCyjaneK Jul 17, 2025
6112512
fix(dprint): ignore monero_c, monero and monero-seed folders
binarybaron Jul 17, 2025
69847a2
fix(swap): Missing import
binarybaron Jul 17, 2025
9e6e0d2
fix(ci): Add gperf as a required dependency for Linux
binarybaron Jul 17, 2025
5aab53e
add notes for unsafe usage to CLAUDE.md
Einliterflasche Jul 18, 2025
198c886
add clean command to justfile
Einliterflasche Jul 18, 2025
9ba7540
fix: minimumSystemVersion to 11.0 because tauri doesn't default behav…
MrCyjaneK Jul 20, 2025
bce49ed
update crunchy dependency to fix linux->windows cross compilation issue
Einliterflasche Jul 21, 2025
27d3c5e
fix last commit
Einliterflasche Jul 21, 2025
9fcc382
link c++ std lib and libgcc statically on windows
binarybaron Jul 21, 2025
b38d5f4
embed WebView2 Bootstrapper
binarybaron Jul 21, 2025
03bb01c
disable ccache on ios, update tauri deps, set minimumSystemVersion to…
binarybaron Jul 24, 2025
b76fba3
fix
Einliterflasche Jul 21, 2025
c4de9eb
fix: build env leaking into contrib/depends
MrCyjaneK Jul 20, 2025
0339487
fix: version '-sim' in target triple 'arm64-apple-ios13.0-simulator-s…
binarybaron Jul 28, 2025
f4a4cd2
get it working on ios
binarybaron Jul 28, 2025
ffc6dc3
Merge master into cyjan-contrib-depends
binarybaron Jul 28, 2025
8bb49e8
Upgrade to nightly Rust toolchain for unstable features
binarybaron Jul 28, 2025
ee325e1
fix
binarybaron Jul 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,28 @@
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"

# Windows defaults to smaller stack sizes which isn't enough due to
# our ginormous call stacks
[target.'cfg(windows)']
rustflags = ["-C", "link-args=/STACK:8388608"]
# Windows defaults to smaller stack sizes which isn't enough
# For the MSVC tool-chain
[target.'cfg(all(windows, target_env = "msvc"))']
rustflags = ["-C", "link-arg=/STACK:8388608"]

# For the GNU/MinGW tool-chain
[target.'cfg(all(windows, target_env = "gnu"))']
rustflags = [
"-C",
"link-arg=-Wl,--stack,8388608",
"-C",
"link-arg=-ladvapi32",
"-C",
"link-arg=-lrpcrt4",
"-C",
"link-arg=-lole32",
"-C",
"link-arg=-lwinhttp",
"-C",
"link-arg=-lcrypt32",
"-C",
"link-arg=-static-libstdc++",
"-C",
"link-arg=-static-libgcc",
]
2 changes: 1 addition & 1 deletion .github/actions/set-monero-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
echo "DEPS_TAURI_LINUX=libwebkit2gtk-4.1-dev curl wget file libxdo-dev libayatana-appindicator3-dev librsvg2-dev" >> $GITHUB_ENV

# Linux dependencies
echo "DEPS_MONERO_LINUX=libabsl-dev libnghttp2-dev libevent-dev libexpat1-dev build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libusb-1.0-0-dev libprotobuf-dev protobuf-compiler git" >> $GITHUB_ENV
echo "DEPS_MONERO_LINUX=libabsl-dev libnghttp2-dev libevent-dev libexpat1-dev build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libusb-1.0-0-dev libprotobuf-dev protobuf-compiler git gperf" >> $GITHUB_ENV

# macOS dependencies
echo "DEPS_MONERO_MACOS=cmake boost openssl zmq libpgm miniupnpc expat libunwind-headers protobuf" >> $GITHUB_ENV
Expand Down
8 changes: 6 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[submodule "monero-sys/monero"]
path = monero-sys/monero
url = https://github.com/SNeedlewoods/seraphis_wallet.git
branch = x_api_add_new_functions_release
url = https://github.com/mrcyjanek/monero
branch = cyjan-fix-ios
[submodule "monero-sys/monero_c"]
path = monero-sys/monero_c
url = https://github.com/mrcyjanek/monero_c.git
branch = develop
Loading