Skip to content
Snippets Groups Projects
Commit 9345e349 authored by Alexandre Janniaux's avatar Alexandre Janniaux Committed by Jean-Baptiste Kempf
Browse files

qt: makefile: add QT5_PLUGINS/QT5_PLATFORM_PLUGINS

QT5_PLUGINS includes the cross-platform plugins for Qml, imageformats,
network, etc, while QT5_PLATFORM_PLUGINS includes mandatory plugins for
specific platforms. LIBS_qt currently contains the optional plugins.
parent f067c577
No related branches found
No related tags found
1 merge request!2479qt: fix contrib to avoid race conditions and make it work on Linux and Macosx reliably
......@@ -27,7 +27,8 @@ libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(builddir)/gui/qt/dialogs/vlm
libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM)
libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM) \
$(QT5_PLUGINS_LIBS) $(QT5_PLATFORM_PLUGINS_LIBS)
libqt_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_DARWIN
libqt_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
......@@ -1060,7 +1061,8 @@ endif
vlc_qt_check_SOURCES = gui/qt/vlc-qt-check.cpp gui/qt/plugins.hpp
vlc_qt_check_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt)
vlc_qt_check_LDADD = $(QT_LIBS)
vlc_qt_check_LDADD = $(QT_LIBS) $(LIBS_qt) $(QT5_PLUGINS_LIBS) $(QT5_PLATFORM_PLUGINS_LIBS)
if ENABLE_QT
gui_LTLIBRARIES += libqt_plugin.la
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment