From b20356ecb30f87a4b7aca162dac946c9710e23f3 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Wed, 15 Apr 2009 14:45:41 +0000
Subject: 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: http://svn.pjsip.org/repos/pjproject/trunk@2601 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/build/Makefile        | 2 +-
 pjmedia/build/os-auto.mak.in  | 8 ++++++++
 pjmedia/build/os-darwinos.mak | 8 ++++++++
 pjmedia/build/os-linux.mak    | 8 ++++++++
 pjmedia/build/os-win32.mak    | 8 ++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'pjmedia/build')

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index e1254167..c0915b43 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -96,7 +96,7 @@ export PJMEDIA_CODEC_OBJS += \
 			$(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 74911aea..603d4971 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -28,6 +28,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@
+AC_NO_G7221_CODEC=@ac_no_g7221_codec@
 
 export CODEC_OBJS=
 
@@ -73,6 +74,13 @@ else
 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 1126bc3f..7904594e 100644
--- a/pjmedia/build/os-darwinos.mak
+++ b/pjmedia/build/os-darwinos.mak
@@ -24,6 +24,7 @@ AC_NO_GSM_CODEC=0
 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 @@ else
 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 184284e9..63910c4a 100644
--- a/pjmedia/build/os-linux.mak
+++ b/pjmedia/build/os-linux.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
+AC_NO_G7221_CODEC=0
 
 export CODEC_OBJS=
 
@@ -64,6 +65,13 @@ else
 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 dcc4dea9..498a9e1a 100644
--- a/pjmedia/build/os-win32.mak
+++ b/pjmedia/build/os-win32.mak
@@ -20,6 +20,7 @@ AC_NO_GSM_CODEC=0
 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 @@ else
 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
-- 
cgit v1.2.3