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

[Rémi Denis-Courmont]

Le 2015-07-31 17:54, Steve Lhomme a écrit :
> diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
> index 5e9240a..9797c8f 100644
> --- a/modules/access/Makefile.am
> +++ b/modules/access/Makefile.am
> @@ -415,7 +415,9 @@ if HAVE_WIN32
>  libsmb_plugin_la_LIBADD += -lmpr
>  endif
>  libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
> +if !HAVE_WINSTORE
>  access_LTLIBRARIES += $(LTLIBsmb)
> +endif
>  EXTRA_LTLIBRARIES += libsmb_plugin.la

Don't set LTLIBfoo if you don't want to build the foo plugin. This does 
not belong here.


> diff --git a/modules/video_output/Makefile.am
> b/modules/video_output/Makefile.am
> index be79e90..07d2f37 100644
> --- a/modules/video_output/Makefile.am
> +++ b/modules/video_output/Makefile.am
> @@ -162,7 +162,9 @@ libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
>  	-DMODULE_NAME_IS_direct2d
>  libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
>  libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
> +if !HAVE_WINSTORE
>  vout_LTLIBRARIES += $(LTLIBdirect2d)
> +endif
>  EXTRA_LTLIBRARIES += libdirect2d_plugin.la

Ditto.

> @@ -174,7 +176,9 @@ libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
> \
>  	-DMODULE_NAME_IS_direct3d9
>  libdirect3d9_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
>  libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
> +if !HAVE_WINSTORE
>  vout_LTLIBRARIES += $(LTLIBdirect3d9)
> +endif
>  EXTRA_LTLIBRARIES += libdirect3d9_plugin.la

Ditto.

> @@ -214,7 +220,9 @@ libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
>  	-DMODULE_NAME_IS_glwin32
>  libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
>  libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
> +if !HAVE_WINSTORE
>  vout_LTLIBRARIES += $(LTLIBglwin32)
> +endif
>  EXTRA_LTLIBRARIES += libglwin32_plugin.la

Ditto.

-- 
Rémi Denis-Courmont
http://www.remlab.net/