From 713df876b94af24048e5e057ddc066f3191b11b0 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Mon, 8 Jan 2024 20:40:29 +0100
Subject: [PATCH] Looks like qt5-static on mingw is completely broken, so do a
 dynamic build instead.

---
 .github/workflows/ccpp.yml    | 1 -
 .github/workflows/release.yml | 1 -
 Makefile                      | 8 ++++----
 src/gui2/build.py             | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0fa8fa45..3955cba6 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -72,7 +72,6 @@ jobs:
           mingw-w64-i686-zlib
           mingw-w64-i686-png2ico
           mingw-w64-i686-qt5-base
-          mingw-w64-i686-qt5-static
           vim
           zip
     - name: update-protobuf
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7b951eb9..47514681 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,6 @@ jobs:
           mingw-w64-i686-zlib
           mingw-w64-i686-png2ico
           mingw-w64-i686-qt5-base
-          mingw-w64-i686-qt5-static
           vim
           zip
     - uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index eef7da04..1537163e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,17 +15,17 @@ ifeq ($(OS), Windows_NT)
 	MINGWBIN = /mingw32/bin
 	CCPREFIX = $(MINGWBIN)/
 	PKG_CONFIG = $(MINGWBIN)/pkg-config
-	WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config --static=yes
+	WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config
 	PROTOC = $(MINGWBIN)/protoc
 	WINDRES = windres
-	LDFLAGS += \
-		-Lc:/mingw32/qt5-static/lib \
-		-static
 	CXXFLAGS += \
 		-fext-numeric-literals \
 		-Wno-deprecated-enum-float-conversion \
 		-Wno-deprecated-enum-enum-conversion
 
+	# For static qt5.
+	#export PKG_CONFIG_PATH = $(MINGWBIN)/../qt5-static/lib/pkgconfig
+
 	# Required to get the gcc run - time libraries on the path.
 	export PATH := $(PATH):$(MINGWBIN)
 endif
diff --git a/src/gui2/build.py b/src/gui2/build.py
index 894b3a5a..8d321042 100644
--- a/src/gui2/build.py
+++ b/src/gui2/build.py
@@ -10,8 +10,8 @@
     srcs=[
         "./main.cc",
     ],
-    cflags=["$(WX_CFLAGS)", "-fPIC"],
-    ldflags=["$(WX_LDFLAGS)"],
+    cflags=["-fPIC"],
+    ldflags=["$(QT5_EXTRA_LIBS)"],
     deps=[
         "+fl2_proto_lib",
         "+protocol",