Skip to content

Commit

Permalink
Fix Windows build issues (x86-64 and Qt 6 related)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlindgren90
jlindgren90 committed Apr 5, 2024
1 parent 236e859 commit b2e630d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion acinclude.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/qtglspectrum/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}

1 comment on commit b2e630d

@radioactiveman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks John, I enabled the autotools build for Windows again with 32ab3a9.

Please sign in to comment.