Ignore:
Timestamp:
May 17, 2010 12:51:06 PM (10 years ago)
Author:
ming
Message:

Merge #1051 into the main trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjmedia/build/Makefile

    r3102 r3174  
    7373export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev 
    7474export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \ 
    75                                  legacy_dev.o null_dev.o pa_dev.o wmme_dev.o alsa_dev.o 
     75                                 coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ 
     76                                 alsa_dev.o 
    7677export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) 
    7778 
Note: See TracChangeset for help on using the changeset viewer.