diff options
| author | bitflash <admin@bitflash.network> | 2026-08-12 10:32:27 -0300 |
|---|---|---|
| committer | bitflash <admin@bitflash.network> | 2026-08-12 10:32:27 -0300 |
| commit | 351f836652907db6e3db76c880284003f0de94b8 (patch) | |
| tree | bf4d287bb587c234ccd275f6b812acfd4027b9b5 /src | |
| parent | c9bc3f6f97ea9090b2038166055da0283c6dc669 (diff) | |
build: fix leftover merge markers in makefile.mingw (drop FD_SETSIZE, keep BITFLASH_NODE_BUILD)
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.mingw | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw index 4e36a5c..f82247a 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw | |||
| @@ -15,13 +15,8 @@ WARNFLAGS = -Wformat -Werror=format \ | |||
| 15 | -Wno-narrowing -Wno-unused-result | 15 | -Wno-narrowing -Wno-unused-result |
| 16 | 16 | ||
| 17 | CXXFLAGS = -std=gnu++14 -O2 $(WARNFLAGS) -fpermissive -pthread \ | 17 | CXXFLAGS = -std=gnu++14 -O2 $(WARNFLAGS) -fpermissive -pthread \ |
| 18 | <<<<<<< HEAD | ||
| 19 | -DWIN32 -DNOPCH \ | 18 | -DWIN32 -DNOPCH \ |
| 20 | -DSECP256K1_STATIC \ | ||
| 21 | ======= | ||
| 22 | -DWIN32 -DNOPCH -DFD_SETSIZE=1024 \ | ||
| 23 | -DSECP256K1_STATIC -DBITFLASH_NODE_BUILD \ | 19 | -DSECP256K1_STATIC -DBITFLASH_NODE_BUILD \ |
| 24 | >>>>>>> origin/main | ||
| 25 | -I$(DEPS)/include -I$(RANDOMX)/src \ | 20 | -I$(DEPS)/include -I$(RANDOMX)/src \ |
| 26 | -I$(DEPS)/include/nlohmann \ | 21 | -I$(DEPS)/include/nlohmann \ |
| 27 | -IC:/msys64/ucrt64/include \ | 22 | -IC:/msys64/ucrt64/include \ |