move libg729 to codec dir.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@127 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/mod_codec_g729/mod_codec_g729.vcproj b/src/mod/mod_codec_g729/mod_codec_g729.vcproj
index 8e97dbcc377f30477695618d174fa62f137f0651..2fb1ca11599e056ea900e859182e7ac270b79d88 100644 (file)
--- 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\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\libg729&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -66,7 +66,7 @@
                                AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"\r
                                OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\libs\libg729\Debug&quot;;..\..\..\w32\vsnet\Debug"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729\Debug&quot;;..\..\..\w32\vsnet\Debug"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb"\r
                                SubSystem="2"\r
@@ -124,7 +124,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\libg729&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
@@ -146,7 +146,7 @@
                                AdditionalDependencies="libapr-1.lib libg729.lib FreeSwitchCore.lib"\r
                                OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\libg729\Release&quot;;..\..\..\w32\vsnet\Release"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\codec\libg729\Release&quot;;..\..\..\w32\vsnet\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 735cd2d487ace20d20c8a4d8dd5fd273ddf0e673..3db52b4f8354d67cf17f6e1088834fbeccaff21b 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -321,15 +321,15 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease)
 End Sub\r
 \r
 Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease)\r
-       If FSO.FolderExists(LibDestDir & "libg729") Then \r
+       If FSO.FolderExists(LibDestDir & "codec\libg729") Then \r
                If BuildDebug Then\r
-                       If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then \r
-                               BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Debug"\r
+                       If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Debug"\r
                        End If\r
                End If\r
                If BuildRelease Then\r
-                       If Not FSO.FileExists(LibDestDir & "libg729\Debug\libg729.lib") Then \r
-                               BuildViaVCBuild LibDestDir & "libg729\libg729.vcproj", "Release"\r
+                       If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "codec\libg729\libg729.vcproj", "Release"\r
                        End If\r
                End If\r
        Else\r