From c750acb828c3a138094a3a9a1f14f5fb4585a6d2 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Thu, 2 Mar 2006 21:12:58 +0000
Subject: [PATCH] fix multiple win32 build issues.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@735 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj |  4 ++--
 src/mod/codecs/mod_l16/mod_l16.c                 |  1 -
 src/mod/codecs/mod_l16/mod_l16.vcproj            |  4 ++--
 src/mod/codecs/mod_speex/mod_speex.vcproj        |  4 ++--
 w32/vsnet/GetLibs.vbs                            | 11 +----------
 w32/vsnet/Tools/curl/curllib.vcproj              |  4 ++--
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj
index 9a2645a0a0..34af2b6321 100644
--- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj
+++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_cepstral Debug"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_cepstral Release"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/codecs/mod_l16/mod_l16.c b/src/mod/codecs/mod_l16/mod_l16.c
index d9100a74d7..bf2351331c 100644
--- a/src/mod/codecs/mod_l16/mod_l16.c
+++ b/src/mod/codecs/mod_l16/mod_l16.c
@@ -30,7 +30,6 @@
  *
  */
 #include <switch.h>
-#include <libresample.h>
 
 static const char modname[] = "mod_rawaudio";
 
diff --git a/src/mod/codecs/mod_l16/mod_l16.vcproj b/src/mod/codecs/mod_l16/mod_l16.vcproj
index b020ca8e4c..1fedad9786 100644
--- a/src/mod/codecs/mod_l16/mod_l16.vcproj
+++ b/src/mod/codecs/mod_l16/mod_l16.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Debug"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Release"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj
index 82f31f71c4..5e036526f0 100644
--- a/src/mod/codecs/mod_speex/mod_speex.vcproj
+++ b/src/mod/codecs/mod_speex/mod_speex.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Speex Debug"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Speex Release"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 8fc80c66b9..13cc7ee2f9 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -22,7 +22,6 @@ BuildModCodecG729=False
 BuildModCodecGSM=False
 BuildModXMPPEvent=False
 BuildModsndfile=False
-BuildModrawaudio=False
 BuildModpcre=False
 BuildModldap=False
 BuildModzeroconf=False
@@ -67,7 +66,7 @@ If objArgs.Count >=1 Then
 			BuildVersion=True
 		Case "Mod_Exosip"   
 			BuildModExosip=True
-		Case "Mod_IaxChan"   
+		Case "Mod_iax"   
 			BuildModIaxChan=True
 		Case "Mod_PortAudio"
 			BuildModPortAudio=True		
@@ -81,8 +80,6 @@ If objArgs.Count >=1 Then
 			BuildModXMPPEvent=True
 		Case "Mod_sndfile"
 			BuildModsndfile=True
-		Case "Mod_rawaudio"
-			BuildModrawaudio=True
 		Case "Mod_pcre"
 			BuildModpcre=True
 		Case "Mod_ldap"
@@ -100,7 +97,6 @@ If objArgs.Count >=1 Then
 			BuildModCodecG729=True
 			BuildModXMPPEvent=True
 			BuildModsndfile=True
-			BuildModrawaudio=True
 			BuildVersion=True
 			BuildModpcre=True
 			BuildModldap=True
@@ -115,7 +111,6 @@ Else
 	BuildModCodecG729=True
 	BuildModXMPPEvent=True
 	BuildModsndfile=True
-	BuildModrawaudio=True
 	BuildVersion=True
 	BuildModldap=True
 	BuildModpcre=True
@@ -190,10 +185,6 @@ If BuildModsndfile Then
 	BuildLibs_libsndfile BuildDebug, BuildRelease
 End If
 
-If BuildModrawaudio Then
-	BuildLibs_libresample BuildDebug, BuildRelease
-End If
-
 If BuildModpcre Then
 	BuildLibs_pcre BuildDebug, BuildRelease
 End If
diff --git a/w32/vsnet/Tools/curl/curllib.vcproj b/w32/vsnet/Tools/curl/curllib.vcproj
index 65195ec0b1..f5fbf52d25 100644
--- a/w32/vsnet/Tools/curl/curllib.vcproj
+++ b/w32/vsnet/Tools/curl/curllib.vcproj
@@ -51,7 +51,7 @@
 				AdditionalIncludeDirectories=".,..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/curllib.pch"
 				AssemblerListingLocation=".\Release/"
@@ -132,7 +132,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/curllib.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"