diff options
| author | Benny Prijono <bennylp@teluu.com> | 2013-10-24 06:27:14 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2013-10-24 06:27:14 +0000 |
| commit | 08500c846c8d9e59b4430bec950f8b7af920c000 (patch) | |
| tree | 0c52c6e71e07f8a1d0c2d0eaab8f94e4f61fd63c /pjmedia | |
| parent | 7bda2e7ce880d8b6429df8d0fdabb0771f99b1f4 (diff) | |
Re #1697: fixed build error with the new coreaudio_dev.m introduced by r4617, because build process looks for an ObjC compiler
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4635 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 2b291282..1970e8c0 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -80,7 +80,7 @@ export PJMEDIA_CFLAGS += $(_CFLAGS) # export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ - coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ + legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ alsa_dev.o bb10_dev.o bdimad_dev.o \ android_jni_dev.o opensl_dev.o export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 04224e88..b0502f3b 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -62,6 +62,8 @@ AC_NO_OPENCORE_AMRWB=@ac_no_opencore_amrwb@ export CODEC_OBJS= +export PJMEDIA_AUDIODEV_OBJS += @ac_pjmedia_audiodev_objs@ + ifeq ($(AC_NO_G711_CODEC),1) export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 else |