diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2004-06-22 00:21:51 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2004-06-22 00:21:51 +0000 |
| commit | fa950fe235dfdd0c206efb0291c012a7773e31dd (patch) | |
| tree | 89560d64baade84d1147a023ceeb2555d828f46d /sys/Makefile.am | |
| parent | 5dc30ab5210837443a253e2b829e25814dc01a34 (diff) | |
configure.ac: Add objective-c support if running in Darwin/Mac OS X
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
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index b2631c5e..9f53cdb3 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -16,6 +16,12 @@ else OSX_AUDIO_DIR= endif +if USE_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif + if USE_QCAM QCAM_DIR=qcam else @@ -64,9 +70,10 @@ else CDROM_DIR= endif -SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(QCAM_DIR) $(SUNAUDIO_DIR) \ - $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR) +SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_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 \ - glsink cdrom +DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \ + xvimage glsink cdrom |