Ticket #774:
- Added build config for GNU autoconf & make.
- Fixed some G.722.1 codes for linux & mingw32 targets, e.g: types
defs, collision function name 'round'.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@2601 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index e125416..c0915b4 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -96,7 +96,7 @@
$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
ipp_codecs.o $(CODEC_OBJS)
export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
- $(ILBC_CFLAGS) $(IPP_CFLAGS)
+ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
###############################################################################
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 74911ae..603d497 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -28,6 +28,7 @@
AC_NO_SPEEX_CODEC=@ac_no_speex_codec@
AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@
AC_NO_G722_CODEC=@ac_no_g722_codec@
+AC_NO_G7221_CODEC=@ac_no_g7221_codec@
export CODEC_OBJS=
@@ -73,6 +74,13 @@
export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
endif
+ifeq ($(AC_NO_G7221_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G7221_CODEC=0
+else
+export CODEC_OBJS += g7221.o
+export G7221_CFLAGS += -I$(THIRD_PARTY)
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-darwinos.mak b/pjmedia/build/os-darwinos.mak
index 1126bc3..7904594 100644
--- a/pjmedia/build/os-darwinos.mak
+++ b/pjmedia/build/os-darwinos.mak
@@ -24,6 +24,7 @@
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
AC_NO_G722_CODEC=0
+AC_NO_G7221_CODEC=0
export CODEC_OBJS=
@@ -70,6 +71,13 @@
export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
endif
+ifeq ($(AC_NO_G7221_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G7221_CODEC=0
+else
+export CODEC_OBJS += g7221.o
+export G7221_CFLAGS += -I$(THIRD_PARTY)
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak
index 184284e..63910c4 100644
--- a/pjmedia/build/os-linux.mak
+++ b/pjmedia/build/os-linux.mak
@@ -19,6 +19,7 @@
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
AC_NO_G722_CODEC=0
+AC_NO_G7221_CODEC=0
export CODEC_OBJS=
@@ -64,6 +65,13 @@
export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
endif
+ifeq ($(AC_NO_G7221_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G7221_CODEC=0
+else
+export CODEC_OBJS += g7221.o
+export G7221_CFLAGS += -I$(THIRD_PARTY)
+endif
+
#
# PortAudio
diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak
index dcc4dea..498a9e1 100644
--- a/pjmedia/build/os-win32.mak
+++ b/pjmedia/build/os-win32.mak
@@ -20,6 +20,7 @@
AC_NO_SPEEX_CODEC=0
AC_NO_ILBC_CODEC=0
AC_NO_G722_CODEC=0
+AC_NO_G7221_CODEC=0
export CODEC_OBJS=
@@ -66,6 +67,13 @@
export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
endif
+ifeq ($(AC_NO_G7221_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G7221_CODEC=0
+else
+export CODEC_OBJS += g7221.o
+export G7221_CFLAGS += -I$(THIRD_PARTY)
+endif
+
#
# PortAudio
diff --git a/pjmedia/include/pjmedia-codec/config_auto.h.in b/pjmedia/include/pjmedia-codec/config_auto.h.in
index cf49391..69b5628 100644
--- a/pjmedia/include/pjmedia-codec/config_auto.h.in
+++ b/pjmedia/include/pjmedia-codec/config_auto.h.in
@@ -60,6 +60,11 @@
#undef PJMEDIA_HAS_G722_CODEC
#endif
+/* G7221 codec */
+#ifndef PJMEDIA_HAS_G7221_CODEC
+#undef PJMEDIA_HAS_G7221_CODEC
+#endif
+
#endif /* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */
diff --git a/pjmedia/src/pjmedia-codec/g7221.c b/pjmedia/src/pjmedia-codec/g7221.c
index 91c8962..68f846c 100644
--- a/pjmedia/src/pjmedia-codec/g7221.c
+++ b/pjmedia/src/pjmedia-codec/g7221.c
@@ -35,7 +35,7 @@
*/
#if defined(PJMEDIA_HAS_G7221_CODEC) && PJMEDIA_HAS_G7221_CODEC!=0
-#include "../../third_party/g7221/common/defs.h"
+#include "../../../third_party/g7221/common/defs.h"
#define THIS_FILE "g7221.c"