Skip to content

F
freeswitch
提交 a2c448e1 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

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
上级 0673070b
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 4297 行增加 和 107 行删除
libs/jrtplib/jrtplib.def 0 → 100644
浏览文件 @ a2c448e1
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
libs/jrtplib/jrtplib.sln
浏览文件 @ a2c448e1
......@@ -5,12 +5,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "jrtplib.vcproj",
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
......
libs/jrtplib/jrtplib.vcproj
浏览文件 @ a2c448e1
......@@ -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"
/>
</Configuration>
<Configuration
Name="Debug Dll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./src;../jthread-1.1.2/src"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib "
ModuleDefinitionFile="jrtplib.def"
OptimizeReferences="1"
EnableCOMDATFolding="1"
OptimizeForWindows98="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release Dll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="./src;../jthread-1.1.2/src"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib "
ModuleDefinitionFile="jrtplib.def"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
......@@ -471,6 +617,10 @@
>
</File>
</Filter>
<File
RelativePath=".\jrtplib.def"
>
</File>
</Files>
<Globals>
</Globals>
......
libs/jrtplib/src/jrtp4c.h
浏览文件 @ a2c448e1
......@@ -45,12 +45,14 @@ typedef enum {
#ifndef uint32_t
#ifdef WIN32
typedef unsigned int uint32_t;
typedef unsigned __int16 uint16_t;
#else
#include <stdint.h>
#endif
#endif
#ifdef WIN32
typedef SOCKET jrtp_sock_t;
typedef SOCKET jrtp_socket_t;
#else
typedef int jrtp_socket_t;
#endif
......
libs/jrtplib/src/rtpconfig.h
浏览文件 @ a2c448e1
......@@ -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
......
libs/jrtplib/src/rtptransmitter.h
浏览文件 @ a2c448e1
......@@ -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;
......
libs/jrtplib/src/rtptypes.h
浏览文件 @ a2c448e1
......@@ -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
src/include/switch_module_interfaces.h
浏览文件 @ a2c448e1
......@@ -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 */
......
src/include/switch_platform.h
浏览文件 @ a2c448e1
......@@ -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
......
src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/applications/mod_echo/mod_echo.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/applications/mod_playback/mod_playback.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/codecs/mod_g711/mod_g711.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/codecs/mod_g729/mod_g729.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/codecs/mod_l16/mod_l16.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/codecs/mod_speex/mod_speex.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/dialplans/mod_pcre/mod_pcre.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/directories/mod_ldap/mod_ldap.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/endpoints/mod_exosip/mod_exosip.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/endpoints/mod_woomera/mod_woomera.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/event_handlers/mod_event_test/mod_event_test.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/languages/mod_perl/fs_perl.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/languages/mod_perl/mod_perl.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
src/mod/timers/mod_softtimer/mod_softtimer.vcproj
浏览文件 @ a2c448e1
......@@ -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"
......
w32/vsnet/FreeSwitchCore.vcproj
浏览文件 @ a2c448e1
......@@ -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 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib"
AdditionalDependencies="Ws2_32.lib Mswsock.lib libapr-1.lib sqlite.lib libapriconv-1.lib libaprutil-1.lib Rpcrt4.lib libresampled.lib"
OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb"
......@@ -130,7 +130,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
......@@ -149,10 +149,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib"
AdditionalDependencies="Ws2_32.lib Mswsock.lib libapr-1.lib sqlite.lib libapriconv-1.lib libaprutil-1.lib Rpcrt4.lib libresample.lib"
OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
......
w32/vsnet/GetLibs.vbs
浏览文件 @ a2c448e1
......@@ -227,29 +227,33 @@ Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
RenameFolder LibDestDir & "apr-util-1.2.2", "apr-util"
FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True
FSO.CopyFile Utilsdir & "apr\gen_uri_delims.vcproj", LibDestDir & "apr-util\uri\", True
FSO.CopyFile Utilsdir & "apr\aprutil.vcproj", LibDestDir & "apr-util\", True
FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True
End If
If FSO.FolderExists(LibDestDir & "apr-util") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "apr-util\uri\uri_delims.h") Then
BuildViaVCBuild LibDestDir & "apr-util\uri\gen_uri_delims.vcproj", "Debug"
End If
If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\LibD\xml.lib") Then
If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\Debug\xml.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\xml\expat\lib\xml.vcproj", "Debug"
End If
If Not FSO.FileExists(LibDestDir & "apr-util\LibD\aprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Debug"
If Not FSO.FileExists(LibDestDir & "apr-util\Debug\libaprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\libaprutil.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr-util\Debug\libaprutil-1.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "apr-util\Debug\libaprutil-1.lib", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "apr-util\uri\uri_delims.h") Then
BuildViaVCBuild LibDestDir & "apr-util\uri\gen_uri_delims.vcproj", "Release"
End If
If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\LibR\xml.lib") Then
If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\Release\xml.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\xml\expat\lib\xml.vcproj", "Release"
End If
If Not FSO.FileExists(LibDestDir & "apr-util\LibR\aprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Release"
If Not FSO.FileExists(LibDestDir & "apr-util\Release\libaprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\libaprutil.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr-util\Release\libaprutil-1.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "apr-util\Release\libaprutil-1.lib", ScriptDir & "Release\", True
End If
End If
Else
......@@ -265,17 +269,21 @@ Sub BuildLibs_apriconv(BuildDebug, BuildRelease)
WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"
FSO.CopyFile Utilsdir & "apr\apriconv.vcproj", LibDestDir & "apr-iconv\", True
FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True
End If
If FSO.FolderExists(LibDestDir & "apr-iconv") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "apr-iconv\LibD\apriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Debug"
If Not FSO.FileExists(LibDestDir & "apr-iconv\Debug\libapriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\libapriconv.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr-iconv\Debug\libapriconv-1.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "apr-iconv\Debug\libapriconv-1.lib", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "apr-iconv\LibR\apriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Release"
If Not FSO.FileExists(LibDestDir & "apr-iconv\Release\libapriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\libapriconv.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr-iconv\Release\libapriconv-1.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "apr-iconv\Release\libapriconv-1.lib", ScriptDir & "Release\", True
End If
End If
Else
......@@ -291,18 +299,22 @@ Sub BuildLibs_apr(BuildDebug, BuildRelease)
WgetUnCompress LibsBase & "apr-1.2.2.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "apr-1.2.2", "apr"
FSO.CopyFile Utilsdir & "apr\apr.vcproj", LibDestDir & "apr\", True
FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True
FindReplaceInFile LibDestDir & "apr\file_io\unix\fullrw.c", "int i;", "unsigned int i;"
End If
If FSO.FolderExists(LibDestDir & "apr") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "apr\LibD\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Debug"
If Not FSO.FileExists(LibDestDir & "apr\Debug\libapr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\libapr.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr\Debug\libapr-1.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "apr\Debug\libapr-1.lib", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "apr\LibR\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Release"
If Not FSO.FileExists(LibDestDir & "apr\Release\libapr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\libapr.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr\Release\libapr-1.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "apr\Release\libapr-1.lib", ScriptDir & "Release\", True
End If
End If
Else
......@@ -369,13 +381,17 @@ Sub BuildLibs_jrtplib(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "jrtplib")Then
If BuildDebug Then
If (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug"
If (Not FSO.FileExists(LibDestDir & "jrtplib\Debug Dll\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug Dll"
FSO.CopyFile LibDestDir & "jrtplib\Debug Dll\jrtplib.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "jrtplib\Debug Dll\jrtplib.lib", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
If (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release"
If (Not FSO.FileExists(LibDestDir & "jrtplib\Release Dll\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release Dll"
FSO.CopyFile LibDestDir & "jrtplib\Release Dll\jrtplib.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "jrtplib\Release Dll\jrtplib.lib", ScriptDir & "Release\", True
End If
End If
Else
......
w32/vsnet/Tools/apr/libapr.vcproj 0 → 100644
浏览文件 @ a2c448e1
差异被折叠。
w32/vsnet/Tools/apr/libapriconv.vcproj 0 → 100644
浏览文件 @ a2c448e1
差异被折叠。
w32/vsnet/Tools/apr/libaprutil.vcproj 0 → 100644
浏览文件 @ a2c448e1
差异被折叠。
w32/vsnet/Tools/apr/xml.vcproj
浏览文件 @ a2c448e1
......@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\LibR"
OutputDirectory=".\Release"
IntermediateDirectory=".\LibR"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
......@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\LibR\xml.lib"
OutputFile="$(OutDir)\xml.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -91,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\LibD"
OutputDirectory=".\Debug"
IntermediateDirectory=".\LibD"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
......@@ -140,7 +140,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\LibD\xml.lib"
OutputFile="$(OutDir)\xml.lib"
SuppressStartupBanner="true"
/>
<Tool
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论