[vlc-devel] [PATCH] disable some modules not available on Windows App Store

[Steve Lhomme]

---
 modules/access/Makefile.am         | 2 ++
 modules/audio_output/Makefile.am   | 4 ++++
 modules/codec/Makefile.am          | 4 ++++
 modules/control/Makefile.am        | 4 +++-
 modules/video_output/Makefile.am   | 4 ++++
 modules/video_splitter/Makefile.am | 2 ++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 5ded5f5..b948a88 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -422,8 +422,10 @@ if HAVE_WIN32
 libsmb_plugin_la_LIBADD += -lmpr
 endif
 libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
+if !HAVE_WINSTORE
 access_LTLIBRARIES += $(LTLIBsmb)
 EXTRA_LTLIBRARIES += libsmb_plugin.la
+endif
 
 libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/sd.c
 libdsm_plugin_la_CFLAGS = $(AM_CFLAGS) $(DSM_CFLAGS)
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index 366193b..05778ca 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -72,12 +72,14 @@ aout_LTLIBRARIES += libwinstore_plugin.la
 endif
 endif
 
+if !HAVE_WINSTORE
 libdirectsound_plugin_la_SOURCES = audio_output/directsound.c \
 	audio_output/windows_audio_common.h
 libdirectsound_plugin_la_LIBADD = -lole32
 if HAVE_DIRECTX
 aout_LTLIBRARIES += libdirectsound_plugin.la
 endif
+endif
 
 libkai_plugin_la_SOURCES = audio_output/kai.c
 libkai_plugin_la_LIBADD = $(KAI_LIBS)
@@ -91,12 +93,14 @@ if HAVE_SNDIO
 aout_LTLIBRARIES += libsndio_plugin.la
 endif
 
+if !HAVE_WINSTORE
 libwaveout_plugin_la_SOURCES = audio_output/waveout.c \
 	audio_output/windows_audio_common.h
 libwaveout_plugin_la_LIBADD = -lwinmm
 if HAVE_WIN32
 aout_LTLIBRARIES += libwaveout_plugin.la
 endif
+endif
 
 libauhal_plugin_la_SOURCES = audio_output/auhal.c \
 	audio_output/TPCircularBuffer.h audio_output/TPCircularBuffer.c
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index c35e511..85081ca 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -508,6 +508,7 @@ codec_LTLIBRARIES += $(LTLIBqsv)
 
 ### External frameworks ###
 
+if !HAVE_WINSTORE
 libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c
 libqsv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libdmo_plugin_la_LIBADD = $(LIBM)
@@ -515,12 +516,15 @@ if HAVE_WIN32
 libdmo_plugin_la_LIBADD += -lole32 -luuid
 codec_LTLIBRARIES += libdmo_plugin.la
 endif
+endif
 
+if !HAVE_WINSTORE
 libmft_plugin_la_SOURCES = codec/mft.c packetizer/h264_nal.c packetizer/h264_nal.h
 if HAVE_WIN32
 libmft_plugin_la_LIBADD = -lole32 -luuid -lmfuuid -lmfplat
 codec_LTLIBRARIES += libmft_plugin.la
 endif
+endif
 
 libquicktime_plugin_la_SOURCES = codec/quicktime.c
 libquicktime_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
diff --git a/modules/control/Makefile.am b/modules/control/Makefile.am
index 06f258c..6f62d11 100644
--- a/modules/control/Makefile.am
+++ b/modules/control/Makefile.am
@@ -60,12 +60,14 @@ if HAVE_XCB_KEYSYMS
 control_LTLIBRARIES += libxcb_hotkeys_plugin.la
 endif
 
+if !HAVE_WINSTORE
 libntservice_plugin_la_SOURCES = control/ntservice.c
+endif
 libwin_hotkeys_plugin_la_SOURCES = control/globalhotkeys/win32.c
 libwin_msg_plugin_la_SOURCES = control/win_msg.c
 if HAVE_WIN32
-control_LTLIBRARIES += libntservice_plugin.la
 if !HAVE_WINSTORE
+control_LTLIBRARIES += libntservice_plugin.la
 control_LTLIBRARIES += libwin_hotkeys_plugin.la libwin_msg_plugin.la
 endif
 endif
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 2fba21a..5485657 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -158,6 +158,7 @@ endif
 
 
 ### Win32 ###
+if !HAVE_WINSTORE
 libdirect2d_plugin_la_SOURCES = video_output/msw/direct2d.c \
 	video_output/msw/common.c video_output/msw/common.h \
 	video_output/msw/events.c video_output/msw/events.h \
@@ -180,6 +181,7 @@ libdirect3d9_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
 libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d9)
 EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
+endif
 
 libdirect3d11_plugin_la_SOURCES = video_output/msw/direct3d11.c \
  video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h \
@@ -198,6 +200,7 @@ libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d11)
 EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
 
+if !HAVE_WINSTORE
 libdirectdraw_plugin_la_SOURCES = video_output/msw/directdraw.c \
 	video_output/msw/common.c video_output/msw/common.h \
 	video_output/msw/events.c video_output/msw/events.h \
@@ -233,6 +236,7 @@ if !HAVE_WINSTORE
 vout_LTLIBRARIES += libwingdi_plugin.la
 endif
 endif
+endif
 
 libegl_win32_plugin_la_SOURCES = video_output/egl.c
 libegl_win32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WIN32=1
diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
index f0e023c..84043de 100644
--- a/modules/video_splitter/Makefile.am
+++ b/modules/video_splitter/Makefile.am
@@ -8,6 +8,7 @@ libclone_plugin_la_SOURCES = video_splitter/clone.c
 
 libwall_plugin_la_SOURCES = video_splitter/wall.c
 
+if !HAVE_WINSTORE
 libpanoramix_plugin_la_SOURCES = video_splitter/panoramix.c
 libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
 libpanoramix_plugin_la_LIBADD = $(LIBM)
@@ -20,3 +21,4 @@ libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS)
 splitter_LTLIBRARIES += libpanoramix_plugin.la
 endif
 endif
+endif
-- 
2.4.2