Ignore:
Timestamp:
Dec 14, 2010 1:03:10 PM (13 years ago)
Author:
ming
Message:

Fixed #1183

  • QT capture device for Mac
  • iOS device for iOS (capture device only works for iOS 4.0 or above)
  • Add NSAutoReleasePool for sdl_dev (Mac)
  • Add NSAutoReleasePool for vid_dev_test (Mac)
  • build system for compilation of Obj-C files (.m)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/2.0-dev/pjmedia/build/os-auto.mak.in

    r3392 r3395  
    11# @configure_input@ 
     2 
     3# Define the desired video device backend 
     4# Valid values are: 
     5#   - mac_os 
     6#   - iphone_os 
     7AC_PJMEDIA_VIDEO = @ac_pjmedia_video@ 
    28 
    39# SDL flags 
     
    1319V4L2_LDFLAGS = @ac_v4l2_ldflags@ 
    1420 
     21# QT 
     22AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@ 
     23QT_CFLAGS = @ac_qt_cflags@ 
     24 
     25# iOS 
     26IOS_CFLAGS = @ac_ios_cflags@ 
     27 
    1528# PJMEDIA features exclusion 
    1629export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ 
    17                  $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) 
     30                 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ 
     31                 $(IOS_CFLAGS) 
    1832export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) 
    1933 
     
    133147endif 
    134148 
     149# 
     150# QT video device 
     151# 
     152ifeq ($(AC_PJMEDIA_VIDEO_HAS_QT),yes) 
     153export PJMEDIA_VIDEODEV_OBJS += qt_dev.o 
     154endif 
    135155 
     156# 
     157# iOS video device 
     158# 
     159ifeq ($(AC_PJMEDIA_VIDEO),iphone_os) 
     160export PJMEDIA_VIDEODEV_OBJS += ios_dev.o 
     161endif 
     162 
     163# 
     164# Determine whether we should compile the obj-c version of a particular source code 
     165# 
     166ifeq ($(AC_PJMEDIA_VIDEO),mac_os) 
     167# Mac OS specific, use obj-c 
     168export PJMEDIA_VIDEODEV_OBJS += sdl_dev_m.o 
     169export PJMEDIA_TEST_OBJS += vid_dev_test_m.o 
     170else 
     171# Other platforms, compile .c 
     172export PJMEDIA_VIDEODEV_OBJS += sdl_dev.o 
     173export PJMEDIA_TEST_OBJS += vid_dev_test.o 
     174endif 
Note: See TracChangeset for help on using the changeset viewer.