[vlc-commits] qt4: OS/2 does not have additional dependencies

KO Myung-Hun git at videolan.org
Mon Jul 22 15:16:11 CEST 2013


vlc | branch: master | KO Myung-Hun <komh78 at gmail.com> | Mon Jul 22 21:43:55 2013 +0900| [1ba8b126c35d30d412cb49feb7c80541c3bd3edc] | committer: Rafaël Carré

qt4: OS/2 does not have additional dependencies

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ba8b126c35d30d412cb49feb7c80541c3bd3edc
---

 modules/gui/qt4/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
index 0727225..692bd2f 100644
--- a/modules/gui/qt4/Makefile.am
+++ b/modules/gui/qt4/Makefile.am
@@ -19,11 +19,14 @@ SUFFIXES = .ui .h .hpp .moc.cpp
 libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS)
 libqt4_plugin_la_LIBADD = $(AM_LIBADD) $(QT_LIBS)
 libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
+if HAVE_OS2
+else
 if HAVE_WIN32
 libqt4_plugin_la_LIBADD += -lole32
 else
 libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
 endif
+endif
 if HAVE_DARWIN
 libqt4_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
 endif



More information about the vlc-commits mailing list