msvc build tweaks

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

diff --git a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj
index 214b8fa6f50e29cc491077aec6b515f719417b37..970e3678ae976c730a69765cea692babd2037940 100644 (file)
--- a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj
+++ b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj
@@ -65,7 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_bridgecall.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_bridgecall.pdb"\r
                                SubSystem="2"\r
@@ -144,7 +144,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_bridgecall.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release""\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/applications/mod_echo/mod_echo.vcproj b/src/mod/applications/mod_echo/mod_echo.vcproj
index d95e1a3f2666541551754319145d370d70d9633e..61bab5cad9c981aecf82dcb83f43e89794e48053 100644 (file)
--- a/src/mod/applications/mod_echo/mod_echo.vcproj
+++ b/src/mod/applications/mod_echo/mod_echo.vcproj
@@ -65,7 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_echo.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_echo.pdb"\r
                                SubSystem="2"\r
@@ -144,7 +144,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_echo.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release""\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
index eec015c7ec24d66290123df52deefe3b86bf1b53..378d242b3c65bf5e0971034570aae9801161d05e 100644 (file)
--- a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
+++ b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
@@ -65,7 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ivrtest.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_ivrtest.pdb"\r
                                SubSystem="2"\r
@@ -144,7 +144,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ivrtest.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release""\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/applications/mod_playback/mod_playback.vcproj b/src/mod/applications/mod_playback/mod_playback.vcproj
index b6ac82763ae5cd0f87c70f1ae51f979b19276244..44658efd5a030cf7dba8e3d8f268907b771c2955 100644 (file)
--- a/src/mod/applications/mod_playback/mod_playback.vcproj
+++ b/src/mod/applications/mod_playback/mod_playback.vcproj
@@ -65,7 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_playback.pdb"\r
                                SubSystem="2"\r
@@ -144,7 +144,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_playback.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release""\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj
index 34af2b6321b315c58130ee519f11bb08f7bb9ea6..d264737dae2c8221af3849528ab3da199e8ef017 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_cepstral.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt"\r
+                               AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_cepstral.pdb"\r
                                SubSystem="2"\r
@@ -148,7 +148,7 @@
                                AdditionalDependencies="swift.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_cepstral.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt"\r
+                               AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/codecs/mod_g711/mod_g711.vcproj b/src/mod/codecs/mod_g711/mod_g711.vcproj
index c1612edaca8f19066703c45864d5652ef04f9457..32da2fb3c6d8165568735811b06e0a2543ccf366 100644 (file)
--- a/src/mod/codecs/mod_g711/mod_g711.vcproj
+++ b/src/mod/codecs/mod_g711/mod_g711.vcproj
@@ -65,7 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_g711.pdb"\r
                                SubSystem="2"\r
@@ -143,7 +143,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\libs\apr\Release""\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/codecs/mod_g729/mod_g729.vcproj b/src/mod/codecs/mod_g729/mod_g729.vcproj
index cff3fc45429f786370464cbed9595d3c8a4d7c98..1f8b1a4673b8c2fee515fbc194583067e8a734eb 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g729.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\apr\Debug";"$(InputDir)..\..\..\..\libs\codec\libg729\Debug";..\..\..\..\w32\vsnet\Debug"\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\Debug";..\..\..\..\w32\vsnet\Debug"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_g729.pdb"\r
                                SubSystem="2"\r

diff --git a/src/mod/codecs/mod_gsm/mod_gsm.vcproj b/src/mod/codecs/mod_gsm/mod_gsm.vcproj
index 027c1af079df49b524c5ef4c6d58d6d7f030ffb0..e7607a713b3ae04f015cec3149ec860f3313bcfc 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;..\..\..\..\w32\vsnet\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;"$(OutDir)""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb"\r
                                SubSystem="2"\r
@@ -147,7 +147,7 @@
                                AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;..\..\..\..\w32\vsnet\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/codecs/mod_l16/mod_l16.vcproj b/src/mod/codecs/mod_l16/mod_l16.vcproj
index 1fedad9786b50b118867bd8e4b7ac0c49ceaa260..85a91c2011e1c1374e836e165dc8d94e719181e8 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win""\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_l16.pdb"\r
                                SubSystem="2"\r
@@ -147,7 +147,7 @@
                                AdditionalDependencies="libresample.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win""\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj
index 5e036526f0336fded1856aefc09e2a02e3876840..71bd0a5ac75f4d5a2b7cbe74920ead1737f677bc 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug""\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug";$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_speex.pdb"\r
                                SubSystem="2"\r
@@ -147,7 +147,7 @@
                                AdditionalDependencies="libspeex.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release""\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release";$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj
index b42bd2c4ee909832a155531382adda4479b2174d..e83f1531f176c4edf834ac64354528518b92dd8f 100644 (file)
--- 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"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\pcre\win32\Release""\r
+                               AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\pcre\win32\Release";$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj
index acee2906b3fe4f163ca54462120586c9600b27c1..ba9ae1182c83bc90fedcb8c060493593d23f36a9 100644 (file)
--- a/w32/vsnet/FreeSwitchConsole.vcproj
+++ b/w32/vsnet/FreeSwitchConsole.vcproj
@@ -65,6 +65,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/FreeSwitch.exe"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb"\r
                                SubSystem="1"\r
@@ -142,6 +143,7 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/FreeSwitch.exe"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r