fix project files for new version of pcre

Also, add ..\.. to the include path to match SCons behavior,
so that you can include files relative to src\ rather than
relative to the current source's directory.

1 files changed, 32 insertions, 68 deletions

diff --git a/src/mongo/db/db.vcxproj b/src/mongo/db/db.vcxproj
index 5679c26e1e2..f782a938ea0 100755
--- a/src/mongo/db/db.vcxproj
+++ b/src/mongo/db/db.vcxproj
@@ -179,7 +179,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>No</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -208,7 +208,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>No</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -237,7 +237,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -265,7 +265,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -294,7 +294,7 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_UNICODE;UNICODE;;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -325,7 +325,7 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_UNICODE;UNICODE;;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -356,7 +356,7 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -385,7 +385,7 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\..\js\src;..\..\third_party\pcre-7.4;c:\boost;\boost</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..;..\..\js\src;..\..\third_party\pcre-8.30;c:\boost;\boost</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>;;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -417,7 +417,7 @@
     <ClCompile Include="..\client\distlock.cpp" />

     <ClCompile Include="..\client\model.cpp" />

     <ClCompile Include="..\s\default_version.cpp" />

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcrecpp.cc">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcrecpp.cc">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -435,7 +435,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_chartables.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_chartables.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -453,7 +453,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_compile.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_compile.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -471,7 +471,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_config.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_config.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -489,7 +489,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_dfa_exec.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_dfa_exec.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -507,7 +507,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_exec.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_exec.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -525,7 +525,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_fullinfo.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_fullinfo.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -543,7 +543,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_get.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_get.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -561,7 +561,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_globals.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_globals.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -579,7 +579,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_info.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_maketables.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -597,7 +597,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_maketables.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_newline.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -615,7 +615,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_newline.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_ord2utf8.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -633,7 +633,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_ord2utf8.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_refcount.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -651,7 +651,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_refcount.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_scanner.cc">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -669,7 +669,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_scanner.cc">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_stringpiece.cc">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -687,7 +687,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_stringpiece.cc">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_study.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -705,7 +705,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_study.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_tables.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -723,7 +723,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_tables.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_ucd.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -741,7 +741,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_try_flipped.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_valid_utf8.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -759,7 +759,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_ucp_searchfuncs.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_version.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -777,7 +777,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_valid_utf8.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcre_xclass.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -795,43 +795,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

       </PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_version.c">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

-      </PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcre_xclass.c">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">

-      </PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="..\..\third_party\pcre-7.4\pcreposix.c">

+    <ClCompile Include="..\..\third_party\pcre-8.30\pcreposix.c">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

       </PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">

@@ -1218,8 +1182,8 @@
     <ClInclude Include="..\client\parallel.h" />

     <ClInclude Include="..\s\d_logic.h" />

     <ClInclude Include="..\targetver.h" />

-    <ClInclude Include="..\..\third_party\pcre-7.4\config.h" />

-    <ClInclude Include="..\..\third_party\pcre-7.4\pcre.h" />

+    <ClInclude Include="..\..\third_party\pcre-8.30\config.h" />

+    <ClInclude Include="..\..\third_party\pcre-8.30\pcre.h" />

     <ClInclude Include="..\..\third_party\snappy\config.h" />

     <ClInclude Include="..\..\third_party\snappy\snappy.h" />

     <ClInclude Include="..\util\alignedbuilder.h" />