From 6ca1a1d6799474f8ca977b93ab630af7ace879c2 Mon Sep 17 00:00:00 2001 From: Victorio Nascimento <155357371+Vic-Nas@users.noreply.github.com> Date: Mon, 27 Jul 2026 16:45:28 -0400 Subject: Add Linux GUI installer via Wine (#3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add Linux GUI installer via Wine * Fix launcher creation and add BTF_RELAY env var support * Pool server, Linux GUI, unified binary, README update * Root Makefile: make linux / make windows, cleaner README * Remove headless.cpp * Fix XPM color count mismatch causing toolbar image errors on Linux * XPM icons: same code on Windows and Linux, no ifdefs around image loading * Fix GTK icon crash and Linux printf format * btfrv: 10s socket timeout on relay connects * Faster peer discovery: more dials per pass, shorter backoff and sleep * Parallel btf peer connections * Fix GetMyExternalIP - was disabled, now uses modern IP echo services * Fix tunnel disconnect on idle and restore external IP detection * Filter stale Nostr descriptors * Sort peers by freshness, fresh first * Pool: add .btf Stratum listener — miners connect via rendezvous, no port forwarding needed * btf pool: self-replacing listeners, one per relay, no queuing between miners * Mining modes: solo/operator/participant — pool server on-demand, participant Stratum client * Status bar: show external IP and .btf address * README: clean rewrite, concept-first, minimal * make linux produces AppImage * make linux produces AppImage * Pool dashboard: connect instructions, tabs, share bars * Perf fixes: GetMyExternalIP threaded, btf listener counted * Perf fixes: GetMyExternalIP threaded, btf listener counted * Fix pool payouts: defer until coinbase maturity * Pool: clean mode switching, IP warning * Pool: clean mode switching * Fix gPoolRunning: remove static * AppImage: use real icon from bitcoin.ico * Fix exit crash; Mining menu * Fix exit crash; Mining menu * Fix exit crash; Mining menu * Fix exit crash; Mining menu * Fix exit crash; Mining menu * Windows build: use mingw32-make * Windows build: simpler make invocation * Add deps-windows target * Windows build fixes * Windows build fixes * Windows makefile: fix obj dir * Windows: output to repo root * Windows: bundle DLLs into zip * Replace wxWidgets with ImGui+GLFW: same build on Linux and Windows * Fix %I64d that slipped back through rebase (main.h, net.h) * MinGW: add _mkdir shim for non-MSVC Windows; fix %I64d * Fix gPoolRunning extern outside ifndef _WIN32 * Remove -lboost_system: boost is header-only in this codebase * Status bar: copy buttons for IP and .btf address * Windows: add app icon via windres, strip wx stuff from rc file * Clean GUI: single Options menu item, bigger font, better spacing, cleaner options dialog; update README * GUI: embed Roboto font at 16px for clear readability on all platforms * Windows: windres depends on obj dir target * Fix balance hidden off-screen: put on own line below address bar * Windows: inline mkdir in every rule, remove dir target that confused make * Windows: move all target to top so it's the default rule * Fix pool server not starting: always start when operator selected, re-sync dialog state on open * Write debug.log to data directory (AppData/Roaming/Bitflash on Windows) * Participant miner: use wallet address as username so payouts go to wallet * Add .gitattributes to lock LF line endings, prevent CRLF drift * Refactor pool mining to btf-only transport * Persist pool settings and startup wiring * Prune stale peers and expose pool queries * Fix build regressions and add CLI mode/arg parity * Fix rpc miner stats declaration order * Centralize pool runtime extern declarations * Separate operator/participant dashboards and restore peer stats * Add live telemetry strip and clearer per-mode runtime metrics * Reduce mining dashboard clutter and remove manual pool entry * Count only authorized pool miners * Seed initial pool job on startup * Use a real share target for pool work * Switch pool accounting to round-based shares * Fix nostr pool announcer stats call sites * Fix pool stats definition order * Improve pool worker status display * Add mutex include for participant status * Replace ImClamp in dashboard layout * Clarify participant work status * Log participant status transitions * Reduce peer discovery log noise * Add participant status badge * Track participant auth acknowledgements * Log and validate pool job delivery --------- Co-authored-by: Bitflash Pool Dev --- src/makefile.mingw | 99 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 30 deletions(-) (limited to 'src/makefile.mingw') diff --git a/src/makefile.mingw b/src/makefile.mingw index 0ffac3f..d381653 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -1,44 +1,83 @@ -# Bitflash -- build for MSYS2 UCRT64 (modern g++ + wxWidgets 3.2 + OpenSSL 3 + Berkeley DB 6) -# Based on Satoshi Nakamoto's original 2009 makefile (MIT/X11) -# Usage: (UCRT64 shell) mingw32-make -f makefile.mingw +# Bitflash Windows build — ImGui + GLFW + OpenGL3 +# Run from MSYS2 UCRT64: make -f makefile.mingw CXX = g++ -WXCXXFLAGS := $(shell wx-config --cxxflags) -WXLIBS := $(shell wx-config --libs std,richtext,html) -WXRCFLAGS := $(filter -I%,$(shell wx-config --cxxflags)) $(filter -D%,$(shell wx-config --cxxflags)) - -DEFS = -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -# Path to the project's built dependencies (libsecp256k1 with Schnorr, RandomX) -DEPS = ../deps -RANDOMX = ../RandomX -CXXFLAGS = -std=gnu++14 -O2 -w -fpermissive -Wno-deprecated-declarations -pthread $(DEFS) -I$(DEPS)/include -I$(RANDOMX)/src $(WXCXXFLAGS) -HEADERS = headers.h util.h main.h serialize.h uint256.h key.h bignum.h script.h db.h base58.h net.h irc.h nostr.h randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h uibase.h ui.h - -LIBS = \ - -ldb_cxx \ - -L$(DEPS)/lib -lsecp256k1 \ - -L$(RANDOMX)/build -lrandomx \ - -lsodium \ - -lssl -lcrypto \ - -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 \ - -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lcrypt32 -pthread - -OBJS = obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \ - obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/nostr.o obj/randomx_pow.o obj/btfaddr.o obj/btfchan.o obj/btfrv.o obj/btftunnel.o obj/ui_res.o + +DEPS = ../deps +RANDOMX = ../RandomX +IMGUI_DIR = imgui + +CXXFLAGS = -std=gnu++14 -O2 -w -fpermissive -Wno-deprecated-declarations -pthread \ + -DWIN32 -DNOPCH \ + -DSECP256K1_STATIC \ + -I$(DEPS)/include -I$(RANDOMX)/src \ + -I$(DEPS)/include/nlohmann \ + -IC:/msys64/ucrt64/include \ + -I$(IMGUI_DIR) + +LIBS = -L$(DEPS)/lib -lsecp256k1 \ + -L$(RANDOMX)/build -lrandomx \ + -lsodium -lssl -lcrypto -ldb_cxx -lpthread \ + -LC:/msys64/ucrt64/lib \ + -lglfw3 -lopengl32 -lgdi32 \ + -lkernel32 -luser32 -lcomdlg32 -lwinspool -lwinmm \ + -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid \ + -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lcrypt32 + +IMGUI_OBJS = obj/imgui.o obj/imgui_draw.o obj/imgui_tables.o \ + obj/imgui_widgets.o obj/imgui_impl_glfw.o obj/imgui_impl_opengl3.o + +NODE_OBJS = obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o \ + obj/market.o obj/sha.o obj/irc.o obj/nostr.o obj/randomx_pow.o \ + obj/btfaddr.o obj/btfchan.o obj/btfrv.o obj/btftunnel.o obj/rpc.o + +GUI_OBJS = obj/gui.o obj/main_gui.o obj/bitflash_res.o + +HEADERS = headers_core.h headers.h util.h main.h serialize.h uint256.h \ + key.h bignum.h script.h db.h base58.h net.h irc.h nostr.h \ + randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h all: bitflash.exe +obj/bitflash_res.o: bitflash.rc rc/bitcoin.ico + mkdir -p obj + windres -o $@ -i bitflash.rc + obj/%.o: %.cpp $(HEADERS) + mkdir -p obj $(CXX) -c $(CXXFLAGS) -o $@ $< obj/sha.o: sha.cpp sha.h + mkdir -p obj $(CXX) -c $(CXXFLAGS) -O3 -o $@ $< -obj/ui_res.o: ui.rc rc/bitcoin.ico rc/check.ico - windres $(DEFS) $(WXRCFLAGS) -o $@ -i $< +obj/imgui.o: $(IMGUI_DIR)/imgui.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< + +obj/imgui_draw.o: $(IMGUI_DIR)/imgui_draw.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< + +obj/imgui_tables.o: $(IMGUI_DIR)/imgui_tables.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< + +obj/imgui_widgets.o: $(IMGUI_DIR)/imgui_widgets.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< + +obj/imgui_impl_glfw.o: $(IMGUI_DIR)/imgui_impl_glfw.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< + +obj/imgui_impl_opengl3.o: $(IMGUI_DIR)/imgui_impl_opengl3.cpp + mkdir -p obj + $(CXX) -c $(CXXFLAGS) -o $@ $< -bitflash.exe: $(OBJS) - $(CXX) $(CXXFLAGS) -mwindows -Wl,--subsystem,windows -o $@ $(OBJS) $(WXLIBS) $(LIBS) +bitflash.exe: $(IMGUI_OBJS) $(NODE_OBJS) $(GUI_OBJS) + $(CXX) $(CXXFLAGS) -mwindows -o $@ $^ $(LIBS) + @echo "Built: bitflash.exe" clean: - rm -f obj/*.o bitflash.exe + rm -rf obj bitflash.exe -- cgit v1.2.3