From: Michael Jerris <mike@jerris.com>
Date: Wed, 28 Dec 2005 20:53:32 +0000 (+0000)
Subject: add libresample to mod_rawaudio in msvc
X-Git-Tag: v1.0-beta1~3489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ef2601979966e06a712d21f4cb49bc178c2545;p=thirdparty%2Ffreeswitch.git

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 da2a55f6a9..5d27eac6d4 100644
--- a/src/mod/mod_rawaudio/mod_rawaudio.vcproj
+++ b/src/mod/mod_rawaudio/mod_rawaudio.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -62,9 +63,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libresampled.lib"
 				OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\libresample\win&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_rawaudio.pdb"
 				SubSystem="2"
@@ -106,6 +108,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -140,9 +143,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libresample.lib"
 				OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\libresample\win&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 6671f34f96..b54d944a07 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -17,6 +17,7 @@ BuildModCodecG729=False
 BuildModCodecGSM=False
 BuildModXMPPEvent=False
 BuildModsndfile=False
+BuildModrawaudio=False
 quote=Chr(34)
 ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))
 
@@ -57,6 +58,8 @@ If objArgs.Count >=1 Then
 			BuildModXMPPEvent=True
 		Case "Mod_sndfile"
 			BuildModsndfile=True
+		Case "Mod_rawaudio"
+			BuildModrawaudio=True
 		Case Else
 			BuildCore=True
 			BuildModExosip=True
@@ -66,6 +69,7 @@ If objArgs.Count >=1 Then
 			BuildModCodecG729=True
 			BuildModXMPPEvent=True
 			BuildModsndfile=True
+			BuildModrawaudio=True
 	End Select
 Else
 	BuildCore=True
@@ -76,6 +80,7 @@ Else
 	BuildModCodecG729=True
 	BuildModXMPPEvent=True
 	BuildModsndfile=True
+	BuildModrawaudio=True
 End If
 
 
@@ -115,6 +120,10 @@ If BuildModsndfile Then
 	BuildLibs_Modsndfile BuildDebug, BuildRelease
 End If
 
+If BuildModrawaudio Then
+	BuildLibs_Modrawaudio BuildDebug, BuildRelease
+End If
+
 WScript.Echo "Complete"
 
 Sub BuildLibs_Core(BuildDebug, BuildRelease)
@@ -528,6 +537,29 @@ Sub BuildLibs_Modsndfile(BuildDebug, BuildRelease)
 	
 End Sub
 
+Sub BuildLibs_Modrawaudio(BuildDebug, BuildRelease)
+	If Not FSO.FolderExists(LibDestDir & "libresample") Then 
+		WgetUnZip "http://www.sofaswitch.com/mikej/libresample-0.1.3.zip", LibDestDir
+		RenameFolder LibDestDir & "libresample-0.1.3", "libresample"
+	End If 
+	If FSO.FolderExists(LibDestDir & "libresample") Then 
+		If BuildDebug Then
+			If Not FSO.FileExists(LibDestDir & "libresample\win\libresampled.lib") Then 
+				BuildViaVCBuild LibDestDir & "libresample\win\libresample.vcproj", "Debug"
+			End If
+		End If
+		If BuildRelease Then
+			If Not FSO.FileExists(LibDestDir & "libresample\win\libresample.lib") Then 
+				BuildViaVCBuild LibDestDir & "libresample\win\libresample.vcproj", "Release"
+			End If
+		End If
+	Else
+		Wscript.echo "Unable to download libresample"
+	End If 
+	
+End Sub
+
+
 Sub UpgradeViaDevEnv(ProjectFile)
 	Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ")
 	Do While oExec.Status <> 1