From dae0ff0d4a83f64b74cd4bcfbafe58ea2892233f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 10 Mar 2006 09:01:40 +0000 Subject: [PATCH] msvc build tweaks git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@833 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj | 4 ++-- src/mod/applications/mod_echo/mod_echo.vcproj | 4 ++-- src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj | 4 ++-- src/mod/applications/mod_playback/mod_playback.vcproj | 4 ++-- src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj | 4 ++-- src/mod/codecs/mod_g711/mod_g711.vcproj | 4 ++-- src/mod/codecs/mod_g729/mod_g729.vcproj | 2 +- src/mod/codecs/mod_gsm/mod_gsm.vcproj | 4 ++-- src/mod/codecs/mod_l16/mod_l16.vcproj | 4 ++-- src/mod/codecs/mod_speex/mod_speex.vcproj | 4 ++-- src/mod/dialplans/mod_pcre/mod_pcre.vcproj | 2 +- w32/vsnet/FreeSwitchConsole.vcproj | 2 ++ 12 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj index 214b8fa6f5..970e3678ae 100644 --- a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj +++ b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj @@ -65,7 +65,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_bridgecall.dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_bridgecall.pdb" SubSystem="2" @@ -144,7 +144,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_bridgecall.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/applications/mod_echo/mod_echo.vcproj b/src/mod/applications/mod_echo/mod_echo.vcproj index d95e1a3f26..61bab5cad9 100644 --- a/src/mod/applications/mod_echo/mod_echo.vcproj +++ b/src/mod/applications/mod_echo/mod_echo.vcproj @@ -65,7 +65,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_echo.dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_echo.pdb" SubSystem="2" @@ -144,7 +144,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_echo.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj index eec015c7ec..378d242b3c 100644 --- a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj +++ b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj @@ -65,7 +65,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ivrtest.dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_ivrtest.pdb" SubSystem="2" @@ -144,7 +144,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ivrtest.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/applications/mod_playback/mod_playback.vcproj b/src/mod/applications/mod_playback/mod_playback.vcproj index b6ac82763a..44658efd5a 100644 --- a/src/mod/applications/mod_playback/mod_playback.vcproj +++ b/src/mod/applications/mod_playback/mod_playback.vcproj @@ -65,7 +65,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_playback.pdb" SubSystem="2" @@ -144,7 +144,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj index 34af2b6321..d264737dae 100644 --- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj +++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj @@ -67,7 +67,7 @@ AdditionalDependencies="swift.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_cepstral.dll" LinkIncremental="2" - AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt" + AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_cepstral.pdb" SubSystem="2" @@ -148,7 +148,7 @@ AdditionalDependencies="swift.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_cepstral.dll" LinkIncremental="1" - AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt" + AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/codecs/mod_g711/mod_g711.vcproj b/src/mod/codecs/mod_g711/mod_g711.vcproj index c1612edaca..32da2fb3c6 100644 --- a/src/mod/codecs/mod_g711/mod_g711.vcproj +++ b/src/mod/codecs/mod_g711/mod_g711.vcproj @@ -65,7 +65,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll" LinkIncremental="2" - AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_g711.pdb" SubSystem="2" @@ -143,7 +143,7 @@ Name="VCLinkerTool" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/codecs/mod_g729/mod_g729.vcproj b/src/mod/codecs/mod_g729/mod_g729.vcproj index cff3fc4542..1f8b1a4673 100644 --- a/src/mod/codecs/mod_g729/mod_g729.vcproj +++ b/src/mod/codecs/mod_g729/mod_g729.vcproj @@ -67,7 +67,7 @@ AdditionalDependencies="libg729.lib FreeSwitchCore.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g729.dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\apr\Debug";"$(InputDir)..\..\..\..\libs\codec\libg729\Debug";..\..\..\..\w32\vsnet\Debug" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\Debug";..\..\..\..\w32\vsnet\Debug" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_g729.pdb" SubSystem="2" diff --git a/src/mod/codecs/mod_gsm/mod_gsm.vcproj b/src/mod/codecs/mod_gsm/mod_gsm.vcproj index 027c1af079..e7607a713b 100644 --- a/src/mod/codecs/mod_gsm/mod_gsm.vcproj +++ b/src/mod/codecs/mod_gsm/mod_gsm.vcproj @@ -67,7 +67,7 @@ AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll" LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;..\..\..\..\w32\vsnet\Debug" + AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;"$(OutDir)"" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb" SubSystem="2" @@ -147,7 +147,7 @@ AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;..\..\..\..\w32\vsnet\Release" + AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/codecs/mod_l16/mod_l16.vcproj b/src/mod/codecs/mod_l16/mod_l16.vcproj index 1fedad9786..85a91c2011 100644 --- a/src/mod/codecs/mod_l16/mod_l16.vcproj +++ b/src/mod/codecs/mod_l16/mod_l16.vcproj @@ -67,7 +67,7 @@ AdditionalDependencies="libresampled.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_l16.pdb" SubSystem="2" @@ -147,7 +147,7 @@ AdditionalDependencies="libresample.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj index 5e036526f0..71bd0a5ac7 100644 --- a/src/mod/codecs/mod_speex/mod_speex.vcproj +++ b/src/mod/codecs/mod_speex/mod_speex.vcproj @@ -67,7 +67,7 @@ AdditionalDependencies="libspeex.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug";$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_speex.pdb" SubSystem="2" @@ -147,7 +147,7 @@ AdditionalDependencies="libspeex.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release";$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj index b42bd2c4ee..e83f1531f1 100644 --- a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj +++ b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj @@ -147,7 +147,7 @@ AdditionalDependencies="libpcre.lib" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\pcre\win32\Release"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\pcre\win32\Release";$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj index acee2906b3..ba9ae1182c 100644 --- a/w32/vsnet/FreeSwitchConsole.vcproj +++ b/w32/vsnet/FreeSwitchConsole.vcproj @@ -65,6 +65,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/FreeSwitch.exe" LinkIncremental="2" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb" SubSystem="1" @@ -142,6 +143,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/FreeSwitch.exe" LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2"