vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu Mar 28 12:00:21 2013 +0100| [0adb8c2a23fa3712a075db60b4ba16a0080451d6] | committer: Felix Paul Kühne
screen: disable compilation for non-Mac Darwin flavors > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0adb8c2a23fa3712a075db60b4ba16a0080451d6 --- configure.ac | 7 +++---- extras/package/ios/build.sh | 2 +- modules/access/Modules.am | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 39a5f25..6b44139 100644 --- a/configure.ac +++ b/configure.ac @@ -1892,13 +1892,12 @@ AC_ARG_ENABLE(screen, [disable screen capture (default enabled)])]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(OpenGL/gl.h, [ - AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ - VLC_ADD_PLUGIN([screen]) - ]) + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGIN([screen]) ]) fi fi +AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"]) dnl dnl VNC/RFB access module diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh index 6828577..864992a 100755 --- a/extras/package/ios/build.sh +++ b/extras/package/ios/build.sh @@ -199,7 +199,6 @@ fi --disable-caca \ --disable-gettext \ --disable-mpcdec \ - --disable-screen \ --disable-upnp \ --disable-gme \ --disable-tremor \ @@ -311,6 +310,7 @@ ${VLCROOT}/configure \ --enable-speex \ --enable-theora \ --enable-flac \ + --disable-screen \ --disable-freetype \ --disable-taglib \ --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator diff --git a/modules/access/Modules.am b/modules/access/Modules.am index dc5d1e2..e6c1b41 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -183,7 +183,7 @@ libscreen_plugin_la_SOURCES += screen/win32.c libscreen_plugin_la_LIBADD += -lgdi32 libvlc_LTLIBRARIES += libscreen_plugin.la endif -if HAVE_DARWIN +if HAVE_MAC_SCREEN libscreen_plugin_la_SOURCES += screen/mac.c libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS) libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
