From 47a9a56959bb8aa0553486d59d6a08abc88ec371 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sun, 21 Sep 2025 17:49:17 +0200
Subject: [PATCH] Remember to set -static for source file compilation, not just
 linking. Use the correct protoc on mingw.

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e4e67d36..85118a85 100644
--- a/Makefile
+++ b/Makefile
@@ -16,21 +16,22 @@ ifeq ($(BUILDTYPE),windows)
 		-ffunction-sections \
 		-fdata-sections \
 		-Wno-attributes \
-		-Wa,-mbig-obj
+		-Wa,-mbig-obj \
+		-static
 	CXXFLAGS += \
 		-std=c++23 \
 		-Wno-deprecated-enum-float-conversion \
 		-Wno-deprecated-enum-enum-conversion \
 		-Wno-attributes \
-		-U__GXX_TYPEINFO_EQUALITY_INLINE \
-		-D__GXX_TYPEINFO_EQUALITY_INLINE \
-		-Wa,-mbig-obj
+		-Wa,-mbig-obj \
+		-static
 	LDFLAGS += -Wl,--gc-sections -static
 	AR = $(MINGW)gcc-ar
 	PKG_CONFIG = $(MINGW)pkg-config --static
 	WINDRES = $(MINGW)windres
 	WX_CONFIG = /usr/i686-w64-mingw32/sys-root/mingw/bin/wx-config-3.0 --static=yes
 	NINJA = /bin/ninja
+	PROTOC = /mingw64/bin/protoc
 	PROTOC_SEPARATOR = ;
 	EXT = .exe