add libresample to mod_rawaudio in msvc

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@229 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/mod_rawaudio/mod_rawaudio.vcproj b/src/mod/mod_rawaudio/mod_rawaudio.vcproj
index da2a55f6a94f0528c22d5cd995bb9c4a9f915b70..5d27eac6d4fcee5f0e7b849acc77264f22234a59 100644 (file)
--- a/src/mod/mod_rawaudio/mod_rawaudio.vcproj
+++ b/src/mod/mod_rawaudio/mod_rawaudio.vcproj
@@ -25,6 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -62,9 +63,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="libresampled.lib"\r
                                OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\libresample\win&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_rawaudio.pdb"\r
                                SubSystem="2"\r
@@ -106,6 +108,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -140,9 +143,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="libresample.lib"\r
                                OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\libresample\win&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 6671f34f96306cf5e46913d41b74706474e50f2f..b54d944a073b8661e375b527a43aca681bfc9476 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -17,6 +17,7 @@ BuildModCodecG729=False
 BuildModCodecGSM=False\r
 BuildModXMPPEvent=False\r
 BuildModsndfile=False\r
+BuildModrawaudio=False\r
 quote=Chr(34)\r
 ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))\r
 \r
@@ -57,6 +58,8 @@ If objArgs.Count >=1 Then
                        BuildModXMPPEvent=True\r
                Case "Mod_sndfile"\r
                        BuildModsndfile=True\r
+               Case "Mod_rawaudio"\r
+                       BuildModrawaudio=True\r
                Case Else\r
                        BuildCore=True\r
                        BuildModExosip=True\r
@@ -66,6 +69,7 @@ If objArgs.Count >=1 Then
                        BuildModCodecG729=True\r
                        BuildModXMPPEvent=True\r
                        BuildModsndfile=True\r
+                       BuildModrawaudio=True\r
        End Select\r
 Else\r
        BuildCore=True\r
@@ -76,6 +80,7 @@ Else
        BuildModCodecG729=True\r
        BuildModXMPPEvent=True\r
        BuildModsndfile=True\r
+       BuildModrawaudio=True\r
 End If\r
 \r
 \r
@@ -115,6 +120,10 @@ If BuildModsndfile Then
        BuildLibs_Modsndfile BuildDebug, BuildRelease\r
 End If\r
 \r
+If BuildModrawaudio Then\r
+       BuildLibs_Modrawaudio BuildDebug, BuildRelease\r
+End If\r
+\r
 WScript.Echo "Complete"\r
 \r
 Sub BuildLibs_Core(BuildDebug, BuildRelease)\r
@@ -528,6 +537,29 @@ Sub BuildLibs_Modsndfile(BuildDebug, BuildRelease)
        \r
 End Sub\r
 \r
+Sub BuildLibs_Modrawaudio(BuildDebug, BuildRelease)\r
+       If Not FSO.FolderExists(LibDestDir & "libresample") Then \r
+               WgetUnZip "http://www.sofaswitch.com/mikej/libresample-0.1.3.zip", LibDestDir\r
+               RenameFolder LibDestDir & "libresample-0.1.3", "libresample"\r
+       End If \r
+       If FSO.FolderExists(LibDestDir & "libresample") Then \r
+               If BuildDebug Then\r
+                       If Not FSO.FileExists(LibDestDir & "libresample\win\libresampled.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "libresample\win\libresample.vcproj", "Debug"\r
+                       End If\r
+               End If\r
+               If BuildRelease Then\r
+                       If Not FSO.FileExists(LibDestDir & "libresample\win\libresample.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "libresample\win\libresample.vcproj", "Release"\r
+                       End If\r
+               End If\r
+       Else\r
+               Wscript.echo "Unable to download libresample"\r
+       End If \r
+       \r
+End Sub\r
+\r
+\r
 Sub UpgradeViaDevEnv(ProjectFile)\r
        Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ")\r
        Do While oExec.Status <> 1\r