Commit 0adb8c2a authored by Felix Paul Kühne's avatar Felix Paul Kühne

screen: disable compilation for non-Mac Darwin flavors

parent 7bd008c0
...@@ -1892,13 +1892,12 @@ AC_ARG_ENABLE(screen, ...@@ -1892,13 +1892,12 @@ AC_ARG_ENABLE(screen,
[disable screen capture (default enabled)])]) [disable screen capture (default enabled)])])
if test "${enable_screen}" != "no"; then if test "${enable_screen}" != "no"; then
if test "${SYS}" = "darwin"; then if test "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(OpenGL/gl.h, [ AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ VLC_ADD_PLUGIN([screen])
VLC_ADD_PLUGIN([screen])
])
]) ])
fi fi
fi fi
AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"])
dnl dnl
dnl VNC/RFB access module dnl VNC/RFB access module
......
...@@ -199,7 +199,6 @@ fi ...@@ -199,7 +199,6 @@ fi
--disable-caca \ --disable-caca \
--disable-gettext \ --disable-gettext \
--disable-mpcdec \ --disable-mpcdec \
--disable-screen \
--disable-upnp \ --disable-upnp \
--disable-gme \ --disable-gme \
--disable-tremor \ --disable-tremor \
...@@ -311,6 +310,7 @@ ${VLCROOT}/configure \ ...@@ -311,6 +310,7 @@ ${VLCROOT}/configure \
--enable-speex \ --enable-speex \
--enable-theora \ --enable-theora \
--enable-flac \ --enable-flac \
--disable-screen \
--disable-freetype \ --disable-freetype \
--disable-taglib \ --disable-taglib \
--disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator
......
...@@ -183,7 +183,7 @@ libscreen_plugin_la_SOURCES += screen/win32.c ...@@ -183,7 +183,7 @@ libscreen_plugin_la_SOURCES += screen/win32.c
libscreen_plugin_la_LIBADD += -lgdi32 libscreen_plugin_la_LIBADD += -lgdi32
libvlc_LTLIBRARIES += libscreen_plugin.la libvlc_LTLIBRARIES += libscreen_plugin.la
endif endif
if HAVE_DARWIN if HAVE_MAC_SCREEN
libscreen_plugin_la_SOURCES += screen/mac.c libscreen_plugin_la_SOURCES += screen/mac.c
libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS) libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices" libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment