From a2c448e1186507617d0c4ce4dfeb3218f78f9455 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 17 Mar 2006 02:45:19 +0000 Subject: [PATCH] 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 --- libs/jrtplib/jrtplib.def | 13 + libs/jrtplib/jrtplib.sln | 46 +- libs/jrtplib/jrtplib.vcproj | 154 +- libs/jrtplib/src/jrtp4c.h | 4 +- libs/jrtplib/src/rtpconfig.h | 2 - libs/jrtplib/src/rtptransmitter.h | 4 +- libs/jrtplib/src/rtptypes.h | 2 + src/include/switch_module_interfaces.h | 2 +- src/include/switch_platform.h | 3 + .../mod_bridgecall/mod_bridgecall.vcproj | 4 +- src/mod/applications/mod_echo/mod_echo.vcproj | 4 +- .../mod_ivrtest/mod_ivrtest.vcproj | 4 +- .../mod_playback/mod_playback.vcproj | 4 +- .../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 | 4 +- src/mod/codecs/mod_ilbc/mod_ilbc.vcproj | 4 +- src/mod/codecs/mod_l16/mod_l16.vcproj | 4 +- src/mod/codecs/mod_speex/mod_speex.vcproj | 4 +- .../mod_dialplan_demo.vcproj | 4 +- .../mod_dialplan_directory.vcproj | 4 +- src/mod/dialplans/mod_pcre/mod_pcre.vcproj | 4 +- src/mod/directories/mod_ldap/mod_ldap.vcproj | 8 +- .../endpoints/mod_exosip/mod_exosip.vcproj | 4 +- .../mod_portaudio/mod_PortAudio.vcproj | 4 +- .../endpoints/mod_woomera/mod_woomera.vcproj | 4 +- .../mod_event_multicast.vcproj | 4 +- .../mod_event_test/mod_event_test.vcproj | 4 +- .../mod_xmpp_event/mod_xmpp_event.vcproj | 4 +- .../mod_zeroconf/mod_zeroconf.vcproj | 4 +- src/mod/languages/mod_perl/fs_perl.vcproj | 2 + src/mod/languages/mod_perl/mod_perl.vcproj | 4 +- .../timers/mod_softtimer/mod_softtimer.vcproj | 4 +- w32/vsnet/FreeSwitchCore.vcproj | 12 +- w32/vsnet/GetLibs.vbs | 58 +- w32/vsnet/Tools/apr/libapr.vcproj | 2042 +++++++++++++++++ w32/vsnet/Tools/apr/libapriconv.vcproj | 427 ++++ w32/vsnet/Tools/apr/libaprutil.vcproj | 1529 ++++++++++++ w32/vsnet/Tools/apr/xml.vcproj | 8 +- 39 files changed, 4297 insertions(+), 107 deletions(-) create mode 100644 libs/jrtplib/jrtplib.def create mode 100644 w32/vsnet/Tools/apr/libapr.vcproj create mode 100644 w32/vsnet/Tools/apr/libapriconv.vcproj create mode 100644 w32/vsnet/Tools/apr/libaprutil.vcproj diff --git a/libs/jrtplib/jrtplib.def b/libs/jrtplib/jrtplib.def new file mode 100644 index 0000000000..39eaaf0b60 --- /dev/null +++ b/libs/jrtplib/jrtplib.def @@ -0,0 +1,13 @@ +EXPORTS +jrtp4c_new +jrtp4c_destroy +jrtp4c_get_rtp_socket +jrtp4c_set_invald_handler +jrtp4c_read +jrtp4c_write +jrtp4c_write_payload +jrtp4c_start +jrtp4c_get_ssrc +jrtp4c_killread +jrtp4c_set_private +jrtp4c_get_private \ No newline at end of file diff --git a/libs/jrtplib/jrtplib.sln b/libs/jrtplib/jrtplib.sln index b5090b99dc..1423f151ea 100644 --- a/libs/jrtplib/jrtplib.sln +++ b/libs/jrtplib/jrtplib.sln @@ -1,20 +1,26 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "jrtplib.vcproj", "{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.ActiveCfg = Debug|Win32 - {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.Build.0 = Debug|Win32 - {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.ActiveCfg = Release|Win32 - {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "jrtplib.vcproj", "{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Dll|Win32 = Debug Dll|Win32 + Debug|Win32 = Debug|Win32 + Release Dll|Win32 = Release Dll|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug Dll|Win32.ActiveCfg = Debug Dll|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug Dll|Win32.Build.0 = Debug Dll|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.ActiveCfg = Debug|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.Build.0 = Debug|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release Dll|Win32.ActiveCfg = Release Dll|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release Dll|Win32.Build.0 = Release Dll|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.ActiveCfg = Release|Win32 + {D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libs/jrtplib/jrtplib.vcproj b/libs/jrtplib/jrtplib.vcproj index 3be740bde9..a383a8abc0 100644 --- a/libs/jrtplib/jrtplib.vcproj +++ b/libs/jrtplib/jrtplib.vcproj @@ -42,7 +42,7 @@ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" @@ -101,7 +101,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="./src;../jthread-1.1.2/src" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" @@ -135,6 +135,152 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -471,6 +617,10 @@ > + + diff --git a/libs/jrtplib/src/jrtp4c.h b/libs/jrtplib/src/jrtp4c.h index 5064e26952..d349df1053 100644 --- a/libs/jrtplib/src/jrtp4c.h +++ b/libs/jrtplib/src/jrtp4c.h @@ -45,12 +45,14 @@ typedef enum { #ifndef uint32_t #ifdef WIN32 typedef unsigned int uint32_t; +typedef unsigned __int16 uint16_t; #else #include #endif #endif + #ifdef WIN32 -typedef SOCKET jrtp_sock_t; +typedef SOCKET jrtp_socket_t; #else typedef int jrtp_socket_t; #endif diff --git a/libs/jrtplib/src/rtpconfig.h b/libs/jrtplib/src/rtpconfig.h index eb2eaad39d..5a52ec43fe 100644 --- a/libs/jrtplib/src/rtpconfig.h +++ b/libs/jrtplib/src/rtpconfig.h @@ -35,10 +35,8 @@ #define RTPCONFIG_H #if (defined(WIN32) || defined(_WIN32_WCE)) -typedef SOCKET jrtp_socket_t; #include "rtpconfig_win.h" #else -typedef int jrtp_socket_t; #include "rtpconfig_unix.h" #endif // WIN32 diff --git a/libs/jrtplib/src/rtptransmitter.h b/libs/jrtplib/src/rtptransmitter.h index 075c977803..07ad3066a1 100644 --- a/libs/jrtplib/src/rtptransmitter.h +++ b/libs/jrtplib/src/rtptransmitter.h @@ -61,8 +61,8 @@ public: virtual int Create(size_t maxpacksize,const RTPTransmissionParams *transparams) = 0; virtual void Destroy() = 0; - virtual jrtp_socket_t GetRTPSocket() {} - virtual jrtp_socket_t GetRTCPSocket() {} + virtual jrtp_socket_t GetRTPSocket() = 0; + virtual jrtp_socket_t GetRTCPSocket() = 0; // The user MUST delete the returned instance when it is no longer needed virtual RTPTransmissionInfo *GetTransmissionInfo() = 0; diff --git a/libs/jrtplib/src/rtptypes.h b/libs/jrtplib/src/rtptypes.h index 0d8668aea0..14d04ecfdc 100644 --- a/libs/jrtplib/src/rtptypes.h +++ b/libs/jrtplib/src/rtptypes.h @@ -32,6 +32,8 @@ #if ! (defined(WIN32) || defined(_WIN32_WCE)) #include "rtptypes_unix.h" + typedef int jrtp_socket_t; #else #include "rtptypes_win.h" + typedef SOCKET jrtp_socket_t; #endif // WIN32 diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index 93bfd4a1f7..c17e28728b 100644 --- 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 */ diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h index 763dcc278a..f9234da415 100644 --- 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 diff --git a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj index 970e3678ae..2a2889ee15 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="$(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" diff --git a/src/mod/applications/mod_echo/mod_echo.vcproj b/src/mod/applications/mod_echo/mod_echo.vcproj index 61bab5cad9..52040eb819 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="$(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" diff --git a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj index 378d242b3c..93ac836891 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="$(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" diff --git a/src/mod/applications/mod_playback/mod_playback.vcproj b/src/mod/applications/mod_playback/mod_playback.vcproj index 44658efd5a..a7a7f86548 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="$(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" diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj index d264737dae..7ff81c0936 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;$(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" diff --git a/src/mod/codecs/mod_g711/mod_g711.vcproj b/src/mod/codecs/mod_g711/mod_g711.vcproj index 32da2fb3c6..23f4c27461 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="$(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" diff --git a/src/mod/codecs/mod_g729/mod_g729.vcproj b/src/mod/codecs/mod_g729/mod_g729.vcproj index 1f8b1a4673..f1f90d9826 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\codec\libg729\Debug";..\..\..\..\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=""$(InputDir)..\..\..\..\libs\apr\Release";"$(InputDir)..\..\..\..\libs\codec\libg729\Release";..\..\..\..\w32\vsnet\Release" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj index 2942d042b2..b5ca5e2fd2 100644 --- 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" diff --git a/src/mod/codecs/mod_l16/mod_l16.vcproj b/src/mod/codecs/mod_l16/mod_l16.vcproj index 85a91c2011..2f935025b0 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";$(OutDir)" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";..\..\..\..\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=""$(InputDir)..\..\..\..\libs\libresample\win";$(OutDir)" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win";..\..\..\..\w32\vsnet\$(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 71bd0a5ac7..9e56387482 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";$(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=""$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release";$(OutDir)" + AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\speex\win32\libspeex\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj b/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj index 42c14bda18..2a51473a3e 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj index d9de87e344..0d6c05f225 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(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 e83f1531f1..999861e058 100644 --- 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=""$(InputDir)..\..\..\..\libs\pcre\win32\Debug"" + 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=""$(InputDir)..\..\..\..\libs\pcre\win32\Release";$(OutDir)" + AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/directories/mod_ldap/mod_ldap.vcproj b/src/mod/directories/mod_ldap/mod_ldap.vcproj index 90081d4078..8d5c7c0081 100644 --- 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=""$(InputDir)..\..\..\..\libs\openldap\Debug"" + 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=""$(InputDir)..\..\..\..\libs\openldap\Release"" + 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" diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj index 0ba404f3a9..b647608ef3 100644 --- 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=""$(InputDir)..\..\..\..\libs\apr\Debug";"$(InputDir)..\..\..\..\libs\jrtp4c\w32\Debug";"$(InputDir)..\..\..\..\libs\jrtplib\Debug";"$(InputDir)..\..\..\..\libs\jthread-1.1.2\Debug";"$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\Debug";"$(InputDir)..\..\..\..\libs\osip\platform\vsnet\Debug"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)";"$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\libs\osip\platform\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)"" 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=""$(InputDir)..\..\..\..\libs\apr\Release";"$(InputDir)..\..\..\..\libs\jrtp4c\w32\Release";"$(InputDir)..\..\..\..\libs\jrtplib\Release";"$(InputDir)..\..\..\..\libs\jthread-1.1.2\Release";"$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\Release";"$(InputDir)..\..\..\..\libs\osip\platform\vsnet\Release"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)";"$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\libs\osip\platform\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj index 714f2af2e7..05221d0a11 100644 --- 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=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib";..\..\..\..\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=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib";..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.vcproj b/src/mod/endpoints/mod_woomera/mod_woomera.vcproj index 4f6bdc1f56..403db02aec 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj index 8428ac791d..3d0a261b0f 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj b/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj index da7c5adb69..3e23ba9374 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj index 9c82341645..3e2027b6b0 100644 --- 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=""..\..\..\..\w32\vsnet\$(OutDir)";"..\..\..\..\libs\iksemel\$(OutDir)"" 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=""..\..\..\..\w32\vsnet\$(OutDir)";"..\..\..\..\libs\iksemel\$(OutDir)"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj index d4d7d16a1b..33a2794f41 100644 --- 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=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Debug";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Debug"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" 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=""$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Release";"$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Release"" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/languages/mod_perl/fs_perl.vcproj b/src/mod/languages/mod_perl/fs_perl.vcproj index 467b6b6c03..3a5406f062 100644 --- 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=""$(InputDir)..\..\..\..\w32\vsnet\$(ConfigurationName)"" GenerateDebugInformation="true" SubSystem="2" TargetMachine="1" @@ -143,6 +144,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\Perl\$(ProjectName).dll" LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\w32\vsnet\$(ConfigurationName)"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/src/mod/languages/mod_perl/mod_perl.vcproj b/src/mod/languages/mod_perl/mod_perl.vcproj index 8449177184..047b3f0d97 100644 --- 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" diff --git a/src/mod/timers/mod_softtimer/mod_softtimer.vcproj b/src/mod/timers/mod_softtimer/mod_softtimer.vcproj index e6b4ff83bd..95d4114e5d 100644 --- 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=""$(InputDir)..\..\..\libs\apr\Release"" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj index cc13df7833..6f8bea4ef1 100644 --- a/w32/vsnet/FreeSwitchCore.vcproj +++ b/w32/vsnet/FreeSwitchCore.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -64,10 +64,10 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w32/vsnet/Tools/apr/libapriconv.vcproj b/w32/vsnet/Tools/apr/libapriconv.vcproj new file mode 100644 index 0000000000..a3618c4f31 --- /dev/null +++ b/w32/vsnet/Tools/apr/libapriconv.vcproj @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w32/vsnet/Tools/apr/libaprutil.vcproj b/w32/vsnet/Tools/apr/libaprutil.vcproj new file mode 100644 index 0000000000..0ac80c46a8 --- /dev/null +++ b/w32/vsnet/Tools/apr/libaprutil.vcproj @@ -0,0 +1,1529 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w32/vsnet/Tools/apr/xml.vcproj b/w32/vsnet/Tools/apr/xml.vcproj index 6482c669d5..1c7ad4e410 100644 --- a/w32/vsnet/Tools/apr/xml.vcproj +++ b/w32/vsnet/Tools/apr/xml.vcproj @@ -16,7 +16,7 @@