Commit 352f88d1 authored by Simon Morlat's avatar Simon Morlat

build with correct video options on macosx.

parent 680aaab0
...@@ -118,26 +118,39 @@ AC_DEFUN([MS_CHECK_VIDEO],[ ...@@ -118,26 +118,39 @@ AC_DEFUN([MS_CHECK_VIDEO],[
AC_CHECK_HEADERS(libswscale/swscale.h) AC_CHECK_HEADERS(libswscale/swscale.h)
CPPFLAGS=$CPPFLAGS_save CPPFLAGS=$CPPFLAGS_save
enable_sdl_default=false
enable_x11_default=true
if test "$macosx_found" = "yes" ; then
enable_sdl_default=true
enable_x11_default=false
OBJCFLAGS="$OBJCFLAGS -framework QTKit "
LIBS="$LIBS -framework QTKit -framework CoreVideo"
AC_LANG_PUSH([Objective C])
AC_CHECK_HEADERS([QTKit/QTKit.h],[],[AC_MSG_ERROR([QTKit framework not found, required for video support])])
AC_LANG_POP([Objective C])
fi
AC_ARG_ENABLE(sdl, AC_ARG_ENABLE(sdl,
[ --disable-sdl Disable SDL support], [ --disable-sdl Disable SDL support (default: disabled except on macos)],
[case "${enableval}" in [case "${enableval}" in
yes) enable_sdl=true ;; yes) enable_sdl=true ;;
no) enable_sdl=false ;; no) enable_sdl=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-sdl) ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-sdl) ;;
esac],[enable_sdl=false]) esac],[enable_sdl=$enable_sdl_default])
sdl_found=false sdl_found=false
if test "$enable_sdl" = "true"; then if test "$enable_sdl" = "true"; then
PKG_CHECK_MODULES(SDL, [sdl >= 1.2.0 ],sdl_found=true,sdl_found=false) PKG_CHECK_MODULES(SDL, [sdl >= 1.2.0 ],sdl_found=true,sdl_found=false)
fi fi
AC_ARG_ENABLE(x11, AC_ARG_ENABLE(x11,
[ --disable-x11 Disable X11 support], [ --disable-x11 Disable X11 support],
[case "${enableval}" in [case "${enableval}" in
yes) enable_x11=true ;; yes) enable_x11=true ;;
no) enable_x11=false ;; no) enable_x11=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
esac],[enable_x11=true]) esac],[enable_x11=$enable_x11_default])
if test "$enable_x11" = "true"; then if test "$enable_x11" = "true"; then
AC_CHECK_HEADERS(X11/Xlib.h) AC_CHECK_HEADERS(X11/Xlib.h)
...@@ -149,7 +162,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[ ...@@ -149,7 +162,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
yes) enable_xv=true ;; yes) enable_xv=true ;;
no) enable_xv=false ;; no) enable_xv=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-xv) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-xv) ;;
esac],[enable_xv=true]) esac],[enable_xv=$enable_x11_default])
if test "$enable_xv" = "true"; then if test "$enable_xv" = "true"; then
AC_CHECK_HEADERS(X11/extensions/Xv.h,[] ,[enable_xv=false]) AC_CHECK_HEADERS(X11/extensions/Xv.h,[] ,[enable_xv=false])
......
...@@ -25,7 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -25,7 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/msvideo.h" #include "mediastreamer2/msvideo.h"
#include "ffmpeg-priv.h" #include "ffmpeg-priv.h"
#ifdef WIN32
#include <malloc.h> #include <malloc.h>
#endif
typedef struct { typedef struct {
FILE *file; FILE *file;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "mediastreamer2/mswebcam.h" #include "mediastreamer2/mswebcam.h"
#include "nowebcam.h" #include "nowebcam.h"
#import <QTKit/QTkit.h> #import <QTKit/QTKit.h>
struct v4mState; struct v4mState;
......
...@@ -19,11 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -19,11 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "mediastreamer-config.h" #include "mediastreamer-config.h"
#endif #endif
#include <stdio.h>
#ifdef HAVE_X11_XLIB_H #ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
......
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