mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Add objective-c support if running in Darwin/Mac OS X

Browse source 
Original commit message from CVS:
2004-06-22  Zaheer Abbas Merali  <zaheerabbas at merali.org>

* configure.ac:
Add objective-c support if running in Darwin/Mac OS X
* sys/Makefile.am:
* sys/osxvideo:
* sys/osxvideo/Makefile.am:
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m:
Add osxvideosink, a cocoa-based osx video sink
This commit is contained in:
Zaheer Abbas Merali 2004-06-22 00:21:51 +00:00
parent 818b452ea7
commit ee158654d5
3 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2004-06-22 Zaheer Abbas Merali <zaheerabbas at merali.org>
* configure.ac:
Add objective-c support if running in Darwin/Mac OS X
* sys/Makefile.am:
* sys/osxvideo:
* sys/osxvideo/Makefile.am:
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m:
Add osxvideosink, a cocoa-based osx video sink
2004-06-19 Jan Schmidt <thaytan@mad.scientist.com> 2004-06-19 Jan Schmidt <thaytan@mad.scientist.com>
* ext/dvdnav/gst-dvd: * ext/dvdnav/gst-dvd:
Grab the gconf key from the right spot Grab the gconf key from the right spot

24
configure.ac
View file

@ -43,7 +43,17 @@ AC_PROG_CC
AM_PROG_CC_STDC AM_PROG_CC_STDC
AM_PROG_AS AM_PROG_AS
AS="${CC}" AS="${CC}"
dnl objective-c for OSX (should check if os is darwin)
case "$host" in
*-*darwin*)
AM_CONDITIONAL([am__fastdepOBJC], false)
OBJC="${CC}"
AC_SUBST(OBJC)
OBJCFLAGS="${CFLAGS}"
AC_SUBST(OBJCFLAGS)
_AM_DEPENDENCIES(OBJC)
;;
esac
dnl the gettext stuff needed dnl the gettext stuff needed
AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
@ -476,6 +486,17 @@ GST_CHECK_FEATURE(OSX_AUDIO, [OSX audio], osxaudiosrc osxaudiosink, [
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, HAVE_OSX_AUDIO="yes", HAVE_OSX_AUDIO="no") AC_CHECK_HEADER(CoreAudio/CoreAudio.h, HAVE_OSX_AUDIO="yes", HAVE_OSX_AUDIO="no")
]) ])
dnl *** OS X video ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_VIDEO, true)
HAVE_OSX_VIDEO="no"
case "$host" in
*-*darwin*)
GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosink, [
AC_CHECK_HEADER(OpenGL/gl.h, HAVE_OSX_VIDEO="yes", HAVE_OSX_VIDEO="no")
])
;;
esac
dnl *** QuickCam *** dnl *** QuickCam ***
translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true) translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true)
GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [ GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [
@ -1856,6 +1877,7 @@ sys/dxr3/Makefile
sys/glsink/Makefile sys/glsink/Makefile
sys/oss/Makefile sys/oss/Makefile
sys/osxaudio/Makefile sys/osxaudio/Makefile
sys/osxvideo/Makefile
sys/qcam/Makefile sys/qcam/Makefile
sys/sunaudio/Makefile sys/sunaudio/Makefile
sys/v4l/Makefile sys/v4l/Makefile

15
sys/Makefile.am
View file

@ -16,6 +16,12 @@ else
OSX_AUDIO_DIR= OSX_AUDIO_DIR=
endif endif
if USE_OSX_VIDEO
OSX_VIDEO_DIR=osxvideo
else
OSX_VIDEO_DIR=
endif
if USE_QCAM if USE_QCAM
QCAM_DIR=qcam QCAM_DIR=qcam
else else
@ -64,9 +70,10 @@ else
CDROM_DIR= CDROM_DIR=
endif endif
SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(QCAM_DIR) $(SUNAUDIO_DIR) \ SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_DIR) \
$(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR) $(SUNAUDIO_DIR) $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) \
$(XI_DIR) $(XV_DIR)
DIST_SUBDIRS=dxr3 oss osxaudio qcam sunaudio v4l v4l2 vcd ximage xvimage \ DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \
glsink cdrom xvimage glsink cdrom