From b2e630d6a35dfc89107430257a85284560180ce2 Mon Sep 17 00:00:00 2001
From: John Lindgren <john@jlindgren.net>
Date: Fri, 5 Apr 2024 01:34:51 -0400
Subject: [PATCH] Fix Windows build issues (x86-64 and Qt 6 related)

---
 acinclude.m4              | 1 -
 configure.ac              | 2 +-
 src/qtglspectrum/Makefile | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 8b199aedbe..9b353f883e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -136,7 +136,6 @@ dnl MinGW-specific flags
 dnl ====================
 if test $HAVE_MSWINDOWS = yes ; then
     AC_DEFINE([__USE_MINGW_ANSI_STDIO], [1], "Use GNU-style printf")
-    CFLAGS="$CFLAGS -march=i686"
 fi
 
 dnl Byte order
diff --git a/configure.ac b/configure.ac
index a68283699c..0644c995c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -551,7 +551,7 @@ else
     QT_MULTIMEDIA_DEP=Qt6Multimedia
     QT_NETWORK_DEP=Qt6Network
     QT_OPENGL_DEP="Qt6OpenGL Qt6OpenGLWidgets"
-    QT_X11_DEP="Qt6Gui >= 6.2"
+    QT_X11_DEP="Qt6Gui >= 6.2 x11 xcb-proto"
 fi
 
 ENABLE_PLUGIN_WITH_DEP(qtaudio,
diff --git a/src/qtglspectrum/Makefile b/src/qtglspectrum/Makefile
index c4abd2be6f..a256d9cc0f 100644
--- a/src/qtglspectrum/Makefile
+++ b/src/qtglspectrum/Makefile
@@ -9,5 +9,5 @@ plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 LD = ${CXX}
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. ${QTOPENGL_CFLAGS} ${GL_CFLAGS}
-LIBS += -lm ${QTOPENGL_LIBS} ${GL_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. ${QT_CFLAGS} ${QTOPENGL_CFLAGS} ${GL_CFLAGS}
+LIBS += -lm ${QT_LIBS} ${QTOPENGL_LIBS} ${GL_LIBS}