diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 9 | ||||
| -rw-r--r-- | src/makefile.mingw | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 3eaf2ba..5ded7d6 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -39,10 +39,17 @@ LIBS = -L$(SECP_LIB) -lsecp256k1 \ | |||
| 39 | -lsodium -lssl -lcrypto -ldb_cxx -lpthread \ | 39 | -lsodium -lssl -lcrypto -ldb_cxx -lpthread \ |
| 40 | -lglfw -lGL | 40 | -lglfw -lGL |
| 41 | 41 | ||
| 42 | # Every header a .cpp here includes has to be listed, not just the interesting | ||
| 43 | # ones. sockcount.h was missing, and it declares a struct that lives in a | ||
| 44 | # function-local static shared across translation units: editing it rebuilt | ||
| 45 | # some objects and not others, and the linker said so in a warning easy to walk | ||
| 46 | # past -- "duplicate section ... has different size". That is one object | ||
| 47 | # indexing a struct by the old layout and another by the new one, in the same | ||
| 48 | # binary. Nothing crashed here, and nothing would say so if it had. | ||
| 42 | HEADERS = headers_core.h headers.h util.h main.h serialize.h uint256.h \ | 49 | HEADERS = headers_core.h headers.h util.h main.h serialize.h uint256.h \ |
| 43 | key.h bignum.h script.h db.h base58.h net.h nostr.h \ | 50 | key.h bignum.h script.h db.h base58.h net.h nostr.h \ |
| 44 | randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h \ | 51 | randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h \ |
| 45 | selftest.h walletcmd.h compat.h | 52 | selftest.h walletcmd.h compat.h sockcount.h font_roboto.h |
| 46 | 53 | ||
| 47 | IMGUI_OBJS = obj/imgui.o obj/imgui_draw.o obj/imgui_tables.o \ | 54 | IMGUI_OBJS = obj/imgui.o obj/imgui_draw.o obj/imgui_tables.o \ |
| 48 | obj/imgui_widgets.o obj/imgui_impl_glfw.o obj/imgui_impl_opengl3.o | 55 | obj/imgui_widgets.o obj/imgui_impl_glfw.o obj/imgui_impl_opengl3.o |
diff --git a/src/makefile.mingw b/src/makefile.mingw index 94d2146..5be3704 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw | |||
| @@ -46,10 +46,17 @@ NODE_OBJS = obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o \ | |||
| 46 | 46 | ||
| 47 | GUI_OBJS = obj/gui.o obj/main_gui.o obj/bitflash_res.o | 47 | GUI_OBJS = obj/gui.o obj/main_gui.o obj/bitflash_res.o |
| 48 | 48 | ||
| 49 | # Every header a .cpp here includes has to be listed, not just the interesting | ||
| 50 | # ones. sockcount.h was missing, and it declares a struct that lives in a | ||
| 51 | # function-local static shared across translation units: editing it rebuilt | ||
| 52 | # some objects and not others, and the linker said so in a warning easy to walk | ||
| 53 | # past -- "duplicate section ... has different size". That is one object | ||
| 54 | # indexing a struct by the old layout and another by the new one, in the same | ||
| 55 | # binary. Nothing crashed here, and nothing would say so if it had. | ||
| 49 | HEADERS = headers_core.h headers.h util.h main.h serialize.h uint256.h \ | 56 | HEADERS = headers_core.h headers.h util.h main.h serialize.h uint256.h \ |
| 50 | key.h bignum.h script.h db.h base58.h net.h nostr.h \ | 57 | key.h bignum.h script.h db.h base58.h net.h nostr.h \ |
| 51 | randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h \ | 58 | randomx_pow.h btfaddr.h btfchan.h btfrv.h btftunnel.h market.h \ |
| 52 | selftest.h walletcmd.h | 59 | selftest.h walletcmd.h sockcount.h compat.h font_roboto.h |
| 53 | 60 | ||
| 54 | all: bitflash.exe | 61 | all: bitflash.exe |
| 55 | 62 | ||