提交 611e8043 authored 作者: Michael Jerris's avatar Michael Jerris

move libg729 to codec dir.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@127 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 08cf6c09
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\libg729&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib" AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll" OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\libs\libg729\Debug&quot;;..\..\..\w32\vsnet\Debug" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729\Debug&quot;;..\..\..\w32\vsnet\Debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb" ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb"
SubSystem="2" SubSystem="2"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\libg729&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib" AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll" OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\libg729\Release&quot;;..\..\..\w32\vsnet\Release" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729\Release&quot;;..\..\..\w32\vsnet\Release"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
......
...@@ -321,15 +321,15 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease) ...@@ -321,15 +321,15 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease)
End Sub End Sub
Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease) Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "libg729") Then If FSO.FolderExists(LibDestDir & "codec\libg729") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Debug" BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Release" BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Release"
End If End If
End If End If
Else Else
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论