move libg729 to codec dir.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@127 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2005-12-13 18:44:46 +00:00
parent 08cf6c097a
commit 611e80432e
2 changed files with 9 additions and 9 deletions

View File

@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -66,7 +66,7 @@
AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"
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"
ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb"
SubSystem="2"
@ -124,7 +124,7 @@
/>
<Tool
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"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@ -146,7 +146,7 @@
AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"
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"
SubSystem="2"
OptimizeReferences="2"

View File

@ -321,15 +321,15 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease)
End Sub
Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "libg729") Then
If FSO.FolderExists(LibDestDir & "codec\libg729") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Debug"
If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Release"
If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then
BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Release"
End If
End If
Else