From: Michael Jerris <mike@jerris.com>
Date: Tue, 23 May 2006 16:38:48 +0000 (+0000)
Subject: use dynamic lib for pcre on windows.
X-Git-Tag: v1.0-beta1~2636
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6853b563c4c1041023c0dc5cf789f894e5ff29a4;p=thirdparty%2Ffreeswitch.git

use dynamic lib for pcre on windows.

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

diff --git a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
index 4095a85f17..17cc0af2b0 100644
--- a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
+++ b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
@@ -42,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				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;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;PCRE_STATIC"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -67,7 +67,7 @@
 				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_dialplan_xml.pdb"
 				SubSystem="2"
@@ -125,8 +125,8 @@
 			/>
 			<Tool
 				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;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;PCRE_STATIC"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -147,7 +147,7 @@
 				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dialplan_xml.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\pcre\win32\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index e09896fd85..693bd52b30 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -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.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 
 	If FSO.FolderExists(LibDestDir & "pcre") 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\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
 		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\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
 	Else
diff --git a/w32/vsnet/Tools/pcre/libpcre.vcproj b/w32/vsnet/Tools/pcre/libpcre.vcproj
index 6cea048f5f..e26ec93526 100644
--- a/w32/vsnet/Tools/pcre/libpcre.vcproj
+++ b/w32/vsnet/Tools/pcre/libpcre.vcproj
@@ -25,7 +25,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 			<Tool
@@ -111,7 +110,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 			<Tool
@@ -198,7 +196,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 			<Tool
@@ -256,7 +253,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="$(InputDir)..\pcre.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
@@ -300,7 +297,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 			<Tool
@@ -358,7 +354,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="$(InputDir)..\pcre.def"
 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				ImportLibrary="$(OutDir)\$(ProjectName).lib"
 				TargetMachine="1"