From 483805f79570115ab95c69698792d238c1719b1b Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 11 Mar 2013 15:09:56 -0500
Subject: Import pjproject-2.1

---
 pjmedia/build/Makefile             |  6 ++++--
 pjmedia/build/os-auto.mak.in       | 11 ++++++++++-
 pjmedia/build/pjmedia_codec.vcproj | 12 ++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'pjmedia/build')

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 2f97296..026d89c 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -113,7 +113,7 @@ export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
 export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o \
 			h263_packetizer.o h264_packetizer.o \
 			$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-			ipp_codecs.o $(CODEC_OBJS) \
+			ipp_codecs.o opencore_amr.o silk.o $(CODEC_OBJS) \
                         g7221_sdp_match.o amr_sdp_match.o
 export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
 			$(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
@@ -173,7 +173,9 @@ pjmedia-audiodev:
 pjsdp:
 	$(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB)
 
-pjmedia-test: $(PJMEDIA_LIB)
+$(PJMEDIA_LIB): pjmedia
+
+pjmedia-test: $(PJMEDIA_LIB) pjmedia
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
 
 .PHONY: ../lib/pjmedia.ko
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 98ecf28..04224e8 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -58,6 +58,7 @@ AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@
 AC_NO_G722_CODEC=@ac_no_g722_codec@
 AC_NO_G7221_CODEC=@ac_no_g7221_codec@
 AC_NO_OPENCORE_AMRNB=@ac_no_opencore_amrnb@
+AC_NO_OPENCORE_AMRWB=@ac_no_opencore_amrwb@
 
 export CODEC_OBJS=
 
@@ -113,7 +114,15 @@ endif
 ifeq ($(AC_NO_OPENCORE_AMRNB),1)
 export CFLAGS += -DPJMEDIA_HAS_OPENCORE_AMRNB_CODEC=0
 else
-export CODEC_OBJS += opencore_amrnb.o
+export CODEC_OBJS += opencore_amr.o
+endif
+
+ifeq ($(AC_NO_OPENCORE_AMRWB),1)
+export CFLAGS += -DPJMEDIA_HAS_OPENCORE_AMRWB_CODEC=0
+else
+ifeq ($(AC_NO_OPENCORE_AMRNB),1)
+export CODEC_OBJS += opencore_amr.o
+endif
 endif
 
 
diff --git a/pjmedia/build/pjmedia_codec.vcproj b/pjmedia/build/pjmedia_codec.vcproj
index 158d43d..eddbc8c 100644
--- a/pjmedia/build/pjmedia_codec.vcproj
+++ b/pjmedia/build/pjmedia_codec.vcproj
@@ -2975,13 +2975,17 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\pjmedia-codec\opencore_amrnb.c"
+				RelativePath="..\src\pjmedia-codec\opencore_amr.c"
 				>
 			</File>
 			<File
 				RelativePath="..\src\pjmedia-codec\passthrough.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\pjmedia-codec\silk.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\pjmedia-codec\speex_codec.c"
 				>
@@ -3122,7 +3126,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\pjmedia-codec\opencore_amrnb.h"
+				RelativePath="..\include\pjmedia-codec\opencore_amr.h"
 				>
 			</File>
 			<File
@@ -3133,6 +3137,10 @@
 				RelativePath="..\include\pjmedia-codec.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\pjmedia-codec\silk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\pjmedia-codec\speex.h"
 				>
-- 
cgit v1.2.3