Update Makefile.am

actually fix the file for buildbot, and remove the "ugly hack".
Warzone2100 · Feb 5, 2018 · 20147f0 · 20147f0
1 parent 15d943b
commit 20147f0
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -331,8 +331,7 @@ endif
 # Here, we need to bring in the "plugins" for Qt5 and they MUST come before the other QT libs.
 # FIXME: At a future date, we should check if they want static builds, but, since we only support those for now...
 if MINGW32
-SQT5_LIBS = -L$(QT5_PLUGIN)/plugins/platforms -lqwindows -lqminimal
-SQT5_LIBS2 = -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport -lQt5ThemeSupport -lQt5Gui -lfreetype
+SQT5_LIBS = -L$(QT5_PLUGIN)/plugins/platforms -lqwindows -lqminimal -lQt5AccessibilitySupport -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport
 else
 SQT5_LIBS =
 SQT5_LIBS2 =
@@ -341,11 +340,11 @@ endif
 if PORTABLE
 warzone2100_portable_LDADD = $(warzone2100_portable_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
 	$(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) \
-	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS) $(SQT5_LIBS2)
+	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
 else
 warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
 	$(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) \
-	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS) $(SQT5_LIBS2)
+	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
 endif