[vlc-commits] WinRT: don't compile DShow, Screen, BDA
Jean-Baptiste Kempf
git at videolan.org
Thu Nov 20 15:25:53 CET 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov 20 15:25:06 2014 +0100| [01eb577330f7903840958151fdbef1186659db41] | committer: Jean-Baptiste Kempf
WinRT: don't compile DShow, Screen, BDA
They depend on GDI or DShow
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01eb577330f7903840958151fdbef1186659db41
---
modules/access/Makefile.am | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 0f5d499..e154bee 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -183,8 +183,10 @@ libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp acc
access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp
libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser
if HAVE_WIN32
+if !HAVE_WINSTORE
access_LTLIBRARIES += libdshow_plugin.la
endif
+endif
### Screen grab ###
@@ -215,10 +217,12 @@ endif
libscreen_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h
libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_WIN32
+if !HAVE_WINSTORE
libscreen_plugin_la_SOURCES += access/screen/win32.c
libscreen_plugin_la_LIBADD = -lgdi32
access_LTLIBRARIES += libscreen_plugin.la
endif
+endif
if HAVE_MAC_SCREEN
libscreen_plugin_la_SOURCES += access/screen/mac.c
libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
@@ -329,6 +333,7 @@ access_LTLIBRARIES += libdtv_plugin.la
endif
if HAVE_WIN32
+if !HAVE_WINSTORE
# Work-around automake bug:
# Use an import library for C++ to retain C linker on other platforms.
libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
@@ -340,6 +345,7 @@ libdtv_plugin_la_DEPENDENCIES = libbda.la
libdtv_plugin_la_LIBADD = libbda.la -lstdc++
access_LTLIBRARIES += libdtv_plugin.la
endif
+endif
# Old Linux DVB scanner
libdvb_plugin_la_SOURCES = \
More information about the vlc-commits
mailing list