More ticket #507: updated GNU build system with the G.722 codec and fixed minor warning about operator precedence
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1871 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 7e18ea9..ce82391 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -26,6 +26,7 @@
AC_NO_GSM_CODEC=@ac_no_gsm_codec@
AC_NO_SPEEX_CODEC=@ac_no_speex_codec@
AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@
+AC_NO_G722_CODEC=@ac_no_g722_codec@
export CODEC_OBJS=
@@ -65,6 +66,12 @@
export CODEC_OBJS += ilbc.o
endif
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-darwinos.mak b/pjmedia/build/os-darwinos.mak
index f76d340..1126bc3 100644
--- a/pjmedia/build/os-darwinos.mak
+++ b/pjmedia/build/os-darwinos.mak
@@ -23,6 +23,7 @@
AC_NO_GSM_CODEC=0
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
export CODEC_OBJS=
@@ -63,6 +64,12 @@
export CODEC_OBJS += ilbc.o
endif
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak
index f707eb5..184284e 100644
--- a/pjmedia/build/os-linux.mak
+++ b/pjmedia/build/os-linux.mak
@@ -18,6 +18,7 @@
AC_NO_GSM_CODEC=0
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
export CODEC_OBJS=
@@ -57,6 +58,12 @@
export CODEC_OBJS += ilbc.o
endif
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak
index 0767cee..dcc4dea 100644
--- a/pjmedia/build/os-win32.mak
+++ b/pjmedia/build/os-win32.mak
@@ -19,6 +19,7 @@
AC_NO_GSM_CODEC=0
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
export CODEC_OBJS=
@@ -59,6 +60,12 @@
export CODEC_OBJS += ilbc.o
endif
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
#
# PortAudio