From fc008444f73687a500d9357176c1c2f9244f1f70 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 10 Dec 2005 04:42:08 +0000 Subject: [PATCH] Added speex codec to solution including autodownload of speex from speex.org. Added scripted build of g729 build. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@109 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/mod_codec_g729/mod_codec_g729.vcproj | 2 + w32/vsnet/Freeswitch.sln | 24 +- w32/vsnet/GetLibs.vbs | 62 ++ w32/vsnet/Tools/libspeex.vcproj | 1030 ++++++++++++++++++ w32/vsnet/mod_speexcodec.vcproj | 211 ++++ 5 files changed, 1318 insertions(+), 11 deletions(-) create mode 100644 w32/vsnet/Tools/libspeex.vcproj create mode 100644 w32/vsnet/mod_speexcodec.vcproj diff --git a/src/mod/mod_codec_g729/mod_codec_g729.vcproj b/src/mod/mod_codec_g729/mod_codec_g729.vcproj index 7a3753002c..d738f4f33f 100644 --- a/src/mod/mod_codec_g729/mod_codec_g729.vcproj +++ b/src/mod/mod_codec_g729/mod_codec_g729.vcproj @@ -25,6 +25,7 @@ > =1 Then BuildModIaxChan=True Case "Mod_PortAudio" BuildModPortAudio=True + Case "Mod_SpeexCodec" + BuildModSpeexCodec=True + Case "Mod_CodecG729" + BuildModCodecG729=True Case Else BuildCore=True BuildModExosip=True BuildModIaxChan=True BuildModPortAudio=True + BuildModSpeexCodec=True + BuildModCodecG729=True End Select Else BuildCore=True BuildModExosip=True BuildModIaxChan=True BuildModPortAudio=True + BuildModSpeexCodec=True + BuildModCodecG729=True End If @@ -73,6 +83,14 @@ If BuildModPortAudio Then BuildLibs_ModPortAudio BuildDebug, BuildRelease End If +If BuildModSpeexCodec Then + BuildLibs_ModSpeexCodec BuildDebug, BuildRelease +End If + +If BuildModCodecG729 Then + BuildLibs_ModCodecG729 BuildDebug, BuildRelease +End If + WScript.Echo "Complete" Sub BuildLibs_Core(BuildDebug, BuildRelease) @@ -279,6 +297,50 @@ Sub BuildLibs_ModPortAudio(BuildDebug, BuildRelease) End Sub +Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease) + If Not FSO.FolderExists(LibDestDir & "speex") Then + WgetUnTarGz "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir + If Not FSO.FolderExists(LibDestDir & "speex-1.1.11.1") Then + Wscript.echo "Unable to get libspeex from default download location, Trying backup location:" + WgetUnTarGz "http://www.sofaswitch.org/mikej/speex-1.1.11.1.tar.gz", LibDestDir + End If + RenameFolder LibDestDir & "speex-1.1.11.1", "speex" + FSO.CopyFile Utilsdir & "libspeex.vcproj", LibDestDir & "speex\win32\libspeex\", True + End If + If FSO.FolderExists(LibDestDir & "speex") Then + If BuildDebug Then + If Not FSO.FileExists(LibDestDir & "speex\win32\libspeex\Debug\libspeex.lib") Then + BuildViaVCBuild LibDestDir & "speex\win32\libspeex\libspeex.vcproj", "Debug" + End If + End If + If BuildRelease Then + If Not FSO.FileExists(LibDestDir & "speex\win32\libspeex\Release\libspeex.lib") Then + BuildViaVCBuild LibDestDir & "speex\win32\libspeex\libspeex.vcproj", "Release" + End If + End If + Else + Wscript.echo "Unable to download libspeex" + End If + +End Sub + +Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease) + If FSO.FolderExists(LibDestDir & "libg729") Then + If BuildDebug Then + If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then + BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Debug" + End If + End If + If BuildRelease Then + If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then + BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Release" + End If + End If + Else + Wscript.echo "Unable to download libg729" + End If +End Sub + Sub UpgradeViaDevEnv(ProjectFile) Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ") Do While oExec.Status <> 1 diff --git a/w32/vsnet/Tools/libspeex.vcproj b/w32/vsnet/Tools/libspeex.vcproj new file mode 100644 index 0000000000..8818837a8a --- /dev/null +++ b/w32/vsnet/Tools/libspeex.vcproj @@ -0,0 +1,1030 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w32/vsnet/mod_speexcodec.vcproj b/w32/vsnet/mod_speexcodec.vcproj new file mode 100644 index 0000000000..57ede2109b --- /dev/null +++ b/w32/vsnet/mod_speexcodec.vcproj @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +