fix multiple win32 build issues.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@735 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
c2398be31b
commit
c750acb828
|
@ -25,7 +25,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_cepstral Debug"
|
CommandLine=""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_cepstral Release"
|
CommandLine=""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <libresample.h>
|
|
||||||
|
|
||||||
static const char modname[] = "mod_rawaudio";
|
static const char modname[] = "mod_rawaudio";
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Debug"
|
CommandLine=""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCPreBuildEventTool"
|
||||||
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Release"
|
CommandLine=""
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
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
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
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
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
|
|
|
@ -22,7 +22,6 @@ BuildModCodecG729=False
|
||||||
BuildModCodecGSM=False
|
BuildModCodecGSM=False
|
||||||
BuildModXMPPEvent=False
|
BuildModXMPPEvent=False
|
||||||
BuildModsndfile=False
|
BuildModsndfile=False
|
||||||
BuildModrawaudio=False
|
|
||||||
BuildModpcre=False
|
BuildModpcre=False
|
||||||
BuildModldap=False
|
BuildModldap=False
|
||||||
BuildModzeroconf=False
|
BuildModzeroconf=False
|
||||||
|
@ -67,7 +66,7 @@ If objArgs.Count >=1 Then
|
||||||
BuildVersion=True
|
BuildVersion=True
|
||||||
Case "Mod_Exosip"
|
Case "Mod_Exosip"
|
||||||
BuildModExosip=True
|
BuildModExosip=True
|
||||||
Case "Mod_IaxChan"
|
Case "Mod_iax"
|
||||||
BuildModIaxChan=True
|
BuildModIaxChan=True
|
||||||
Case "Mod_PortAudio"
|
Case "Mod_PortAudio"
|
||||||
BuildModPortAudio=True
|
BuildModPortAudio=True
|
||||||
|
@ -81,8 +80,6 @@ If objArgs.Count >=1 Then
|
||||||
BuildModXMPPEvent=True
|
BuildModXMPPEvent=True
|
||||||
Case "Mod_sndfile"
|
Case "Mod_sndfile"
|
||||||
BuildModsndfile=True
|
BuildModsndfile=True
|
||||||
Case "Mod_rawaudio"
|
|
||||||
BuildModrawaudio=True
|
|
||||||
Case "Mod_pcre"
|
Case "Mod_pcre"
|
||||||
BuildModpcre=True
|
BuildModpcre=True
|
||||||
Case "Mod_ldap"
|
Case "Mod_ldap"
|
||||||
|
@ -100,7 +97,6 @@ If objArgs.Count >=1 Then
|
||||||
BuildModCodecG729=True
|
BuildModCodecG729=True
|
||||||
BuildModXMPPEvent=True
|
BuildModXMPPEvent=True
|
||||||
BuildModsndfile=True
|
BuildModsndfile=True
|
||||||
BuildModrawaudio=True
|
|
||||||
BuildVersion=True
|
BuildVersion=True
|
||||||
BuildModpcre=True
|
BuildModpcre=True
|
||||||
BuildModldap=True
|
BuildModldap=True
|
||||||
|
@ -115,7 +111,6 @@ Else
|
||||||
BuildModCodecG729=True
|
BuildModCodecG729=True
|
||||||
BuildModXMPPEvent=True
|
BuildModXMPPEvent=True
|
||||||
BuildModsndfile=True
|
BuildModsndfile=True
|
||||||
BuildModrawaudio=True
|
|
||||||
BuildVersion=True
|
BuildVersion=True
|
||||||
BuildModldap=True
|
BuildModldap=True
|
||||||
BuildModpcre=True
|
BuildModpcre=True
|
||||||
|
@ -190,10 +185,6 @@ If BuildModsndfile Then
|
||||||
BuildLibs_libsndfile BuildDebug, BuildRelease
|
BuildLibs_libsndfile BuildDebug, BuildRelease
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If BuildModrawaudio Then
|
|
||||||
BuildLibs_libresample BuildDebug, BuildRelease
|
|
||||||
End If
|
|
||||||
|
|
||||||
If BuildModpcre Then
|
If BuildModpcre Then
|
||||||
BuildLibs_pcre BuildDebug, BuildRelease
|
BuildLibs_pcre BuildDebug, BuildRelease
|
||||||
End If
|
End If
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
AdditionalIncludeDirectories=".,..\include"
|
AdditionalIncludeDirectories=".,..\include"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
|
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="2"
|
||||||
EnableFunctionLevelLinking="true"
|
EnableFunctionLevelLinking="true"
|
||||||
PrecompiledHeaderFile=".\Release/curllib.pch"
|
PrecompiledHeaderFile=".\Release/curllib.pch"
|
||||||
AssemblerListingLocation=".\Release/"
|
AssemblerListingLocation=".\Release/"
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
|
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL"
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="3"
|
||||||
PrecompiledHeaderFile=".\Debug/curllib.pch"
|
PrecompiledHeaderFile=".\Debug/curllib.pch"
|
||||||
AssemblerListingLocation=".\Debug/"
|
AssemblerListingLocation=".\Debug/"
|
||||||
ObjectFile=".\Debug/"
|
ObjectFile=".\Debug/"
|
||||||
|
|
Loading…
Reference in New Issue