kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use dynamic lib for pcre on windows. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1492 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-05-23 16:38:48 +00:00
parent b7c69be9cc
commit 6853b563c4
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
View File

@ -42,8 +42,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre\win32&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;PCRE_STATIC" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -67,7 +67,7 @@
AdditionalDependencies="libpcre.lib" AdditionalDependencies="libpcre.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_dialplan_xml.pdb" ProgramDatabaseFile="$(OutDir)/mod_dialplan_xml.pdb"
SubSystem="2" SubSystem="2"
@ -125,8 +125,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre\win32&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;PCRE_STATIC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
@ -147,7 +147,7 @@
AdditionalDependencies="libpcre.lib" AdditionalDependencies="libpcre.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"

13
w32/vsnet/GetLibs.vbs
View File

@ -767,18 +767,23 @@ Sub BuildLibs_pcre(BuildDebug, BuildRelease)
FSO.CopyFile Utilsdir & "pcre\pcre_chartables.c.vcproj", LibDestDir & "pcre\win32\", True FSO.CopyFile Utilsdir & "pcre\pcre_chartables.c.vcproj", LibDestDir & "pcre\win32\", True
FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "pcre\win32\", True FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "pcre\win32\", True
FSO.CopyFile Utilsdir & "pcre\config.h", LibDestDir & "pcre\win32\", True FSO.CopyFile Utilsdir & "pcre\config.h", LibDestDir & "pcre\win32\", True
FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "include\", True
End If End If
If FSO.FolderExists(LibDestDir & "pcre") Then If FSO.FolderExists(LibDestDir & "pcre") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "pcre\win32\Debug\libpcre.lib") Then If Not FSO.FileExists(LibDestDir & "pcre\win32\Debug DLL\libpcre.lib") Then
BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Debug" BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Debug" BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Debug DLL"
FSO.CopyFile LibDestDir & "pcre\win32\Debug DLL\libpcre.lib", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "pcre\win32\Debug DLL\libpcre.dll", ScriptDir & "Debug\", True
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "pcre\win32\Release\libpcre.lib") Then If Not FSO.FileExists(LibDestDir & "pcre\win32\Release DLL\libpcre.lib") Then
BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Release" BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Release"
BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Release" BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Release DLL"
FSO.CopyFile LibDestDir & "pcre\win32\Release DLL\libpcre.lib", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "pcre\win32\Release DLL\libpcre.dll", ScriptDir & "Release\", True
End If End If
End If End If
Else Else

8
w32/vsnet/Tools/pcre/libpcre.vcproj
View File

@ -25,7 +25,6 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description=""
CommandLine="" CommandLine=""
/> />
<Tool <Tool
@ -111,7 +110,6 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description=""
CommandLine="" CommandLine=""
/> />
<Tool <Tool
@ -198,7 +196,6 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description=""
CommandLine="" CommandLine=""
/> />
<Tool <Tool
@ -256,7 +253,7 @@
OutputFile="$(OutDir)\$(ProjectName).dll" OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="" ModuleDefinitionFile="$(InputDir)..\pcre.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
ImportLibrary="$(OutDir)\$(ProjectName).lib" ImportLibrary="$(OutDir)\$(ProjectName).lib"
@ -300,7 +297,6 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description=""
CommandLine="" CommandLine=""
/> />
<Tool <Tool
@ -358,7 +354,7 @@
OutputFile="$(OutDir)\$(ProjectName).dll" OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="" ModuleDefinitionFile="$(InputDir)..\pcre.def"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
ImportLibrary="$(OutDir)\$(ProjectName).lib" ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1" TargetMachine="1"