Split speex, portaudio, and gsm into third_party directory

git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1168 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 5 insertions, 113 deletions

diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index 96a8257a..37b66488 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Target_Dir ""

 F90=df.exe

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

-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "..\..\split-3rd-party\third_party\portaudio\src\common" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c

+# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""

 F90=df.exe

 # 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" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "..\..\split-3rd-party\third_party\portaudio\src\common" /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

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

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp
index ec7dcc83..30e08ce8 100644
--- a/pjmedia/build/pjmedia_codec.dsp
+++ b/pjmedia/build/pjmedia_codec.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Target_Dir ""

 F90=df.exe

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

-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /c

+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""

 F90=df.exe

 # 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 /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c

+# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party/speex/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -163,114 +163,6 @@ SOURCE="..\include\pjmedia-codec\speex.h"
 SOURCE="..\include\pjmedia-codec\types.h"

 # End Source File

 # End Group

-# Begin Group "GSM 06.10 Library"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\add.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\code.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\config.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\debug.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\decode.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_create.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_decode.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_destroy.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_encode.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_option.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\gsm_print.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\long_term.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\lpc.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\preprocess.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\private.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\proto.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\rpe.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\short_term.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\table.c"

-# ADD CPP /W2

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\toast.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm\unproto.h"

-# End Source File

-# End Group

 # Begin Group "iLBC Codec"

 

 # PROP Default_Filter ""

diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c
index 2322a68d..34f538b2 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -27,7 +27,7 @@
 #include <pj/pool.h>
 #include <pj/string.h>
 #include <pj/os.h>
-#include "gsm/gsm.h"
+#include "../../third_party/gsm/inc/gsm.h"
 
 /*
  * Only build this file if PJMEDIA_HAS_GSM_CODEC != 0