diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-12 12:48:30 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-12 12:48:30 +0000 |
| commit | 6cdf95d0eb8a62ea5599f03db7298b4ab1ff1719 (patch) | |
| tree | 8d2788570a58c85f67f165f67dceddcb00b80dc0 /pjmedia | |
| parent | 8249f59293798cb27c1032f7f6a270afa455788d (diff) | |
Misc (re #1782): Applied OpenH264 CFLAGS/LDFLAGS probing result by configure script into Makefile.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4993 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 2e8d24d7..16efbca6 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -32,13 +32,18 @@ ANDROID_CFLAGS = @ac_android_cflags@ LIBYUV_CFLAGS = @ac_libyuv_cflags@ LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ +# openh264 +OPENH264_CFLAGS = @ac_openh264_cflags@ +OPENH264_LDFLAGS = @ac_openh264_ldflags@ + # PJMEDIA features exclusion export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ - $(IOS_CFLAGS) $(ANDROID_CFLAGS) $(LIBYUV_CFLAGS) + $(IOS_CFLAGS) $(ANDROID_CFLAGS) $(LIBYUV_CFLAGS) \ + $(OPENH264_CFLAGS) export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ - $(LIBYUV_LDFLAGS) + $(LIBYUV_LDFLAGS) $(OPENH264_LDFLAGS) # Define the desired sound device backend # Valid values are: |