Skip to content

Commit 47a9a56

Browse files
committed
Remember to set -static for source file compilation, not just linking. Use the correct
protoc on mingw.
1 parent 6e03bc6 commit 47a9a56

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@ ifeq ($(BUILDTYPE),windows)
1616
-ffunction-sections \
1717
-fdata-sections \
1818
-Wno-attributes \
19-
-Wa,-mbig-obj
19+
-Wa,-mbig-obj \
20+
-static
2021
CXXFLAGS += \
2122
-std=c++23 \
2223
-Wno-deprecated-enum-float-conversion \
2324
-Wno-deprecated-enum-enum-conversion \
2425
-Wno-attributes \
25-
-U__GXX_TYPEINFO_EQUALITY_INLINE \
26-
-D__GXX_TYPEINFO_EQUALITY_INLINE \
27-
-Wa,-mbig-obj
26+
-Wa,-mbig-obj \
27+
-static
2828
LDFLAGS += -Wl,--gc-sections -static
2929
AR = $(MINGW)gcc-ar
3030
PKG_CONFIG = $(MINGW)pkg-config --static
3131
WINDRES = $(MINGW)windres
3232
WX_CONFIG = /usr/i686-w64-mingw32/sys-root/mingw/bin/wx-config-3.0 --static=yes
3333
NINJA = /bin/ninja
34+
PROTOC = /mingw64/bin/protoc
3435
PROTOC_SEPARATOR = ;
3536
EXT = .exe
3637

0 commit comments

Comments
 (0)