From 611e80432e780e86055a32e6ea843f3154a391f0 Mon Sep 17 00:00:00 2001 From: Michael Jerris <mike@jerris.com> Date: Tue, 13 Dec 2005 18:44:46 +0000 Subject: [PATCH] move libg729 to codec dir. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@127 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/mod_codec_g729/mod_codec_g729.vcproj | 8 ++++---- w32/vsnet/GetLibs.vbs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mod/mod_codec_g729/mod_codec_g729.vcproj b/src/mod/mod_codec_g729/mod_codec_g729.vcproj index 8e97dbcc37..2fb1ca1159 100644 --- a/src/mod/mod_codec_g729/mod_codec_g729.vcproj +++ b/src/mod/mod_codec_g729/mod_codec_g729.vcproj @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\libg729"" + AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\codec\libg729"" 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=""$(InputDir)..\..\..\libs\apr\Debug";"$(InputDir)..\..\..\libs\libg729\Debug";..\..\..\w32\vsnet\Debug" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Debug";"$(InputDir)..\..\..\libs\codec\libg729\Debug";..\..\..\w32\vsnet\Debug" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb" SubSystem="2" @@ -124,7 +124,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\libg729"" + AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\codec\libg729"" 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=""$(InputDir)..\..\..\libs\apr\Release";"$(InputDir)..\..\..\libs\libg729\Release";..\..\..\w32\vsnet\Release" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release";"$(InputDir)..\..\..\libs\codec\libg729\Release";..\..\..\w32\vsnet\Release" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs index 735cd2d487..3db52b4f83 100644 --- a/w32/vsnet/GetLibs.vbs +++ b/w32/vsnet/GetLibs.vbs @@ -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