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

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index e09896fd857681dc15eed22ea9672a7b1be3e4b2..693bd52b306a4b3fb686c42ca69d88f847468c26 100644 (file)
--- 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\r
                FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "pcre\win32\", True\r
                FSO.CopyFile Utilsdir & "pcre\config.h", LibDestDir & "pcre\win32\", True\r
+               FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "include\", True\r
        End If \r
        If FSO.FolderExists(LibDestDir & "pcre") Then \r
                If BuildDebug Then\r
-                       If Not FSO.FileExists(LibDestDir & "pcre\win32\Debug\libpcre.lib") Then \r
+                       If Not FSO.FileExists(LibDestDir & "pcre\win32\Debug DLL\libpcre.lib") Then \r
                                BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Debug"\r
-                               BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Debug"\r
+                               BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Debug DLL"\r
+                               FSO.CopyFile LibDestDir & "pcre\win32\Debug DLL\libpcre.lib", ScriptDir & "Debug\", True\r
+                               FSO.CopyFile LibDestDir & "pcre\win32\Debug DLL\libpcre.dll", ScriptDir & "Debug\", True\r
                        End If\r
                End If\r
                If BuildRelease Then\r
-                       If Not FSO.FileExists(LibDestDir & "pcre\win32\Release\libpcre.lib") Then \r
+                       If Not FSO.FileExists(LibDestDir & "pcre\win32\Release DLL\libpcre.lib") Then \r
                                BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Release"\r
-                               BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Release"\r
+                               BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Release DLL"\r
+                               FSO.CopyFile LibDestDir & "pcre\win32\Release DLL\libpcre.lib", ScriptDir & "Release\", True\r
+                               FSO.CopyFile LibDestDir & "pcre\win32\Release DLL\libpcre.dll", ScriptDir & "Release\", True\r
                        End If\r
                End If\r
        Else\r

diff --git a/w32/vsnet/Tools/pcre/libpcre.vcproj b/w32/vsnet/Tools/pcre/libpcre.vcproj
index 6cea048f5fbbe702f7ee1e669d549d28ce8073f1..e26ec935269854acc03bf9e6ee6dfb4fb9b076ae 100644 (file)
--- a/w32/vsnet/Tools/pcre/libpcre.vcproj
+++ b/w32/vsnet/Tools/pcre/libpcre.vcproj
@@ -25,7 +25,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               Description=""\r
                                CommandLine=""\r
                        />\r
                        <Tool\r
@@ -111,7 +110,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               Description=""\r
                                CommandLine=""\r
                        />\r
                        <Tool\r
@@ -198,7 +196,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               Description=""\r
                                CommandLine=""\r
                        />\r
                        <Tool\r
@@ -256,7 +253,7 @@
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               ModuleDefinitionFile=""\r
+                               ModuleDefinitionFile="$(InputDir)..\pcre.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                                ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
@@ -300,7 +297,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               Description=""\r
                                CommandLine=""\r
                        />\r
                        <Tool\r
@@ -358,7 +354,7 @@
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               ModuleDefinitionFile=""\r
+                               ModuleDefinitionFile="$(InputDir)..\pcre.def"\r
                                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                                ImportLibrary="$(OutDir)\$(ProjectName).lib"\r
                                TargetMachine="1"\r