Fixing Makefiles for the new pjmedia-codec and pjsip-simple libraries

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@198 74dad513-b988-da41-8d7b-12977e46ad98

7 files changed, 56 insertions, 28 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 4394c7d2..73a290af 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -6,6 +6,7 @@ PJLIB_LIB:=../../pjlib/lib/libpj-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 
 export PJMEDIA_LIB:=../lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
+export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 
 ###############################################################################
 # Gather all flags.
@@ -45,6 +46,21 @@ export PJMEDIA_CFLAGS += $(_CFLAGS)
 
 
 ###############################################################################
+# Defines for building PJMEDIA-Codec library
+#
+export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
+export PJMEDIA_CODEC_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+			gsm.o pjmedia-codec-lib.o \
+			gsm/add.o gsm/code.o gsm/debug.o gsm/decode.o \
+			gsm/gsm_create.o gsm/gsm_decode.o gsm/gsm_destroy.o \
+			gsm/gsm_encode.o gsm/gsm_explode.o gsm/gsm_implode.o \
+			gsm/gsm_option.o gsm/gsm_print.o gsm/long_term.o \
+			gsm/lpc.o gsm/preprocess.o gsm/rpe.o gsm/short_term.o \
+			gsm/table.o
+export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
 # Defines for building test application
 #
 export PJMEDIA_TEST_SRCDIR = ../src/test
@@ -60,7 +76,7 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
 #
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia 
+TARGETS := pjmedia pjmedia-codec
 #pjmedia-test
 
 all: $(TARGETS)
@@ -71,11 +87,14 @@ doc:
 dep: depend
 distclean: realclean
 
-.PHONY: dep depend pjmedia pjmedia-test clean realclean distclean
+.PHONY: dep depend pjmedia pjmedia-codec pjmedia-test clean realclean distclean
 
 pjmedia:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
 
+pjmedia-codec:
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
+
 pjmedia-test: $(PJMEDIA_LIB)
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
 
@@ -84,13 +103,20 @@ pjmedia-test: $(PJMEDIA_LIB)
 	echo Making $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
 
+.PHONY: ../lib/pjmedia-codec.ko
+../lib/pjmedia-codec.ko:
+	echo Making $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
+
 .PHONY: ../lib/pjmedia-test.ko
 ../lib/pjmedia-test.ko:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
 
 clean depend realclean:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
 	@if test "$@" == "depend"; then \
 	  echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB)' >> .pjmedia-test-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
 	fi
diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak
index cb58993f..1832cd66 100644
--- a/pjmedia/build/os-win32.mak
+++ b/pjmedia/build/os-win32.mak
@@ -8,6 +8,6 @@
 # to all operating systems should go in Makefile instead.
 #
 export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \
-		       $(PA_DIR)/pa_win_ds.o
+		       $(PA_DIR)/pa_win_wmme.o
 
-export OS_CFLAGS += -DPA_NO_ASIO
+export OS_CFLAGS += -DPA_NO_ASIO -DPA_NO_DS
diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index 1449f272..f8434599 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -32,13 +32,13 @@ RSC=rc.exe
 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_release"

-# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"

+# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-release"

+# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_release"

-# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"

+# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-release"

+# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /c

@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia_vc6s.lib"

+# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-release.lib"

 

 !ELSEIF  "$(CFG)" == "pjmedia - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"

+# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-debug"

+# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"

-# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"

+# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-debug"

+# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia_vc6sd.lib"

+# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-debug.lib"

 

 !ENDIF 

 

diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp
index 0b82e9ef..8f67c4f6 100644
--- a/pjmedia/build/pjmedia_codec.dsp
+++ b/pjmedia/build/pjmedia_codec.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-vc6.lib"
+# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-vc6-release.lib"
 
 !ELSEIF  "$(CFG)" == "pjmedia_codec - Win32 Debug"
 
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-vc6d.lib"
+# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-win32-vc6-debug.lib"
 
 !ENDIF 
 
@@ -89,7 +89,7 @@ SOURCE="..\src\pjmedia-codec\gsm.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\src\pjmedia-codec\pjmedia-codec.c"
+SOURCE="..\src\pjmedia-codec\pjmedia-codec-lib.c"
 # End Source File
 # End Group
 # Begin Group "Header Files"
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c
index cc41612a..3ef6dac4 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -280,6 +280,8 @@ static pj_status_t gsm_alloc_codec( pjmedia_codec_factory *factory,
 	codec = pj_pool_zalloc(gsm_codec_factory.pool, 
 			       sizeof(pjmedia_codec));
 	PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM);
+	codec->op = &gsm_op;
+	codec->factory = factory;
     }
 
     pj_mutex_unlock(gsm_codec_factory.mutex);
@@ -413,7 +415,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec,
     if (input->size < 320)
 	return PJMEDIA_CODEC_EPCMTOOSHORT;
 
-    gsm_encode(codec->codec_data, (const short*)input->buf, 
+    gsm_encode(codec->codec_data, (short*)input->buf, 
 	       (unsigned char*)output->buf);
 
     output->size = 33;
@@ -440,7 +442,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec,
 	return PJMEDIA_CODEC_EFRMTOOSHORT;
 
     gsm_decode(codec->codec_data, 
-	       (const unsigned char*)input->buf, 
+	       (unsigned char*)input->buf, 
 	       (short*)output->buf);
 
     output->size = 320;
diff --git a/pjmedia/src/pjmedia-codec/gsm/config.h b/pjmedia/src/pjmedia-codec/gsm/config.h
index cea29465..c31d5141 100644
--- a/pjmedia/src/pjmedia-codec/gsm/config.h
+++ b/pjmedia/src/pjmedia-codec/gsm/config.h
@@ -9,30 +9,30 @@
 #ifndef	CONFIG_H
 #define	CONFIG_H
 
-/*efine	SIGHANDLER_T	int 		/* signal handlers are void	*/
-/*efine HAS_SYSV_SIGNAL	1		/* sigs not blocked/reset?	*/
+/*efine	SIGHANDLER_T	int 		//* signal handlers are void	*/
+/*efine HAS_SYSV_SIGNAL	1		//* sigs not blocked/reset?	*/
 
 #define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
-/*efine	HAS_LIMITS_H	1		/* /usr/include/limits.h	*/
+/*efine	HAS_LIMITS_H	1		//* /usr/include/limits.h	*/
 #define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
-/*efine	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
+/*efine	HAS_ERRNO_DECL	1		//* errno.h declares errno	*/
 
 #define	HAS_FSTAT 	1		/* fstat syscall		*/
 #define	HAS_FCHMOD 	1		/* fchmod syscall		*/
 #define	HAS_CHMOD 	1		/* chmod syscall		*/
 #define	HAS_FCHOWN 	1		/* fchown syscall		*/
 #define	HAS_CHOWN 	1		/* chown syscall		*/
-/*efine	HAS__FSETMODE 	1		/* _fsetmode -- set file mode	*/
+/*efine	HAS__FSETMODE 	1		//* _fsetmode -- set file mode	*/
 
 #define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
-/*efine	HAS_STRINGS_H	1		/* /usr/include/strings.h 	*/
+/*efine	HAS_STRINGS_H	1		//* /usr/include/strings.h 	*/
 
 #define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
 #define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
-/*efine	HAS_UTIMES	1		/* use utimes()	syscall instead	*/
+/*efine	HAS_UTIMES	1		//* use utimes()	syscall instead	*/
 #define	HAS_UTIME_H	1		/* UTIME header file		*/
-/*efine	HAS_UTIMBUF	1		/* struct utimbuf		*/
-/*efine	HAS_UTIMEUSEC   1		/* microseconds in utimbuf?	*/
+/*efine	HAS_UTIMBUF	1		//* struct utimbuf		*/
+/*efine	HAS_UTIMEUSEC   1		//* microseconds in utimbuf?	*/
 

 
 #endif	/* CONFIG_H */
diff --git a/pjmedia/src/pjmedia-codec/pjmedia-codec.c b/pjmedia/src/pjmedia-codec/pjmedia-codec-lib.c
index 25a3028d..25a3028d 100644
--- a/pjmedia/src/pjmedia-codec/pjmedia-codec.c
+++ b/pjmedia/src/pjmedia-codec/pjmedia-codec-lib.c