windows build update to use more dynamic libs, fix some type issues, and fix jrtp build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@862 d0543943-73ff-0310-b7d9-9358b9ac24b2
2025-08-13 09:36:46 +00:00 · 2006-03-17 02:45:19 +00:00
parent 0673070b11
commit a2c448e118
39 changed files with 4297 additions and 107 deletions
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -466,7 +466,7 @@ struct switch_codec_interface {
 	/*! enumeration defining the type of the codec */
 	const switch_codec_type codec_type;
 	/*! the IANA code number */
-	int ianacode;
+	unsigned int ianacode;
 	/*! the IANA code name */
 	char *iananame;
 	/*! a list of codec implementations related to the codec */
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -42,6 +42,9 @@ extern "C" {

 #ifndef FREESWITCHCORE_EXPORTS
 #pragma comment(lib, "FreeSwitchCore.lib")
+#pragma comment(lib, "libapr-1.lib")
+#pragma comment(lib, "libaprutil-1.lib")
+#pragma comment(lib, "libapriconv-1.lib")
 #endif

 /* disable the following warnings 
--- 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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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;$(OutDir)"
+				AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;..\..\..\..\w32\vsnet\$(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;$(OutDir)"
+				AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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="$(OutDir)"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Debug&quot;;..\..\..\..\w32\vsnet\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_g729.pdb"
 				SubSystem="2"
@@ -147,7 +147,7 @@
 				AdditionalDependencies="libg729.lib FreeSwitchCore.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g729.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Release&quot;;..\..\..\..\w32\vsnet\Release"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
@@ -66,7 +66,7 @@
 				AdditionalDependencies="libilbc.lib FreeSwitchCore.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ilbc.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\..\libs\codec\ilbc\Debug;..\..\..\..\w32\vsnet\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\libs\codec\ilbc\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_ilbc.pdb"
 				SubSystem="2"
@@ -146,7 +146,7 @@
 				AdditionalDependencies="libilbc.lib FreeSwitchCore.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ilbc.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\..\libs\codec\ilbc\Release;..\..\..\..\w32\vsnet\Release"
+				AdditionalLibraryDirectories="..\..\..\..\libs\codec\ilbc\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;;$(OutDir)"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;;..\..\..\..\w32\vsnet\$(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="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;;$(OutDir)"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;;..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- 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="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug&quot;;$(OutDir)"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\speex\win32\libspeex\$(OutDir);..\..\..\..\w32\vsnet\$(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="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release&quot;;$(OutDir)"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\speex\win32\libspeex\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj
+++ b/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_demo.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_dialplan_demo.pdb"
 				SubSystem="2"
@@ -143,7 +143,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_demo.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj
+++ b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_directory.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_dialplan_directory.pdb"
 				SubSystem="2"
@@ -143,7 +143,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_directory.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj
+++ b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj
@@ -67,7 +67,7 @@
 				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\pcre\win32\Debug&quot;"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_pcre.pdb"
 				SubSystem="2"
@@ -147,7 +147,7 @@
 				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\pcre\win32\Release&quot;;$(OutDir)"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/directories/mod_ldap/mod_ldap.vcproj
+++ b/src/mod/directories/mod_ldap/mod_ldap.vcproj
@@ -67,7 +67,7 @@
 				AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ldap.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\Debug&quot;"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\openldap\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_ldap.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ldap.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\Release&quot;"
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\openldap\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -233,7 +233,7 @@
 				AdditionalDependencies="Ws2_32.lib Wldap32.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ldap.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\openldap\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_ldap.pdb"
 				SubSystem="2"
@@ -314,7 +314,7 @@
 				AdditionalDependencies="Ws2_32.lib Wldap32.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_ldap.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\openldap\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj
@@ -71,7 +71,7 @@
 				ShowProgress="0"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtp4c\w32\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtplib\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\jthread-1.1.2\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\osip\platform\vsnet\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\osip\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 				AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib osipparser2.lib osip2.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\osip\platform\vsnet\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\osip\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
+++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
@@ -68,7 +68,7 @@
 				AdditionalDependencies="Ws2_32.lib Iphlpapi.lib  PAStaticWMMED.lib Winmm.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_PortAudio.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;;..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_PortAudio.pdb"
 				SubSystem="2"
@@ -149,7 +149,7 @@
 				AdditionalDependencies="Ws2_32.lib Iphlpapi.lib  PAStaticWMME.lib Winmm.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_PortAudio.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;;..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/endpoints/mod_woomera/mod_woomera.vcproj
+++ b/src/mod/endpoints/mod_woomera/mod_woomera.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomera.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_woomera.pdb"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomera.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj
+++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_multicast.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_event_multicast.pdb"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_multicast.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj
+++ b/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_test.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_event_test.pdb"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_test.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
+++ b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
@@ -67,7 +67,7 @@
 				AdditionalDependencies="FreeSwitchCore.lib iksemel.lib Ws2_32.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_xmpp_event.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\Debug;..\..\..\..\libs\iksemel\Debug"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;..\..\..\..\libs\iksemel\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_xmpp_event.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				AdditionalDependencies="FreeSwitchCore.lib iksemel.lib Ws2_32.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_xmpp_event.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\Release;..\..\..\..\libs\iksemel\Release"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;..\..\..\..\libs\iksemel\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
+++ b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
@@ -67,7 +67,7 @@
 				AdditionalDependencies=" libhowld.lib libmDNSResponderd.lib Ws2_32.lib  iphlpapi.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_zeroconf.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				AdditionalDependencies=" libhowl.lib libmDNSResponder.lib Ws2_32.lib iphlpapi.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;;&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/languages/mod_perl/fs_perl.vcproj
+++ b/src/mod/languages/mod_perl/fs_perl.vcproj
@@ -65,6 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\Perl\$(ProjectName).dll"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\w32\vsnet\$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -143,6 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\Perl\$(ProjectName).dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\w32\vsnet\$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/languages/mod_perl/mod_perl.vcproj
+++ b/src/mod/languages/mod_perl/mod_perl.vcproj
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_perl.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_perl.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_perl.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
--- a/src/mod/timers/mod_softtimer/mod_softtimer.vcproj
+++ b/src/mod/timers/mod_softtimer/mod_softtimer.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_softtimer.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_softtimer.pdb"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_softtimer.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"