From 63673da5eb5ba313f92ee06daf9df8aff6aa0a11 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu, 5 Apr 2012 15:45:38 +0800
Subject: [PATCH] Update GLib Visual C++ projects

Some of the bundled PCRE source files are removed as they are not needed
anymore (please see commit e7c0f10e), so don't include them in the projects
---
 build/win32/vs10/glib.vcxproj.filtersin |  9 ---------
 build/win32/vs10/glib.vcxprojin         | 30 ------------------------------
 build/win32/vs9/glib.vcprojin           | 30 ------------------------------
 3 files changed, 69 deletions(-)

diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index dbc9285..d809d88 100644
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -85,18 +85,12 @@
     <ClCompile Include="..\..\..\glib\pcre\pcre_jit_compile.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_maketables.c">
-      <Filter>Source Files\pcre</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_newline.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_ord2utf8.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_refcount.c">
-      <Filter>Source Files\pcre</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_string_utils.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
@@ -109,9 +103,6 @@
     <ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_version.c">
-      <Filter>Source Files\pcre</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
       <Filter>Source Files\pcre</Filter>
     </ClCompile>
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index 5eb2c04..da7486d 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -451,16 +451,6 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_maketables.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_newline.c">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
@@ -481,16 +471,6 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_refcount.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_string_utils.c">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
@@ -531,16 +511,6 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\glib\pcre\pcre_version.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-DG_LOG_DOMAIN=\"GLib-GRegex\" -UBSR_ANYCRLF -UEBCDIC %(AdditionalOptions)</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index fabb3ee..e49d2f9 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -419,16 +419,6 @@
 					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
-				<File RelativePath="..\..\..\glib\pcre\pcre_maketables.c" >
-					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
 				<File RelativePath="..\..\..\glib\pcre\pcre_newline.c" >
 					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
@@ -449,16 +439,6 @@
 					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
-				<File RelativePath="..\..\..\glib\pcre\pcre_refcount.c" >
-					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
 				<File RelativePath="..\..\..\glib\pcre\pcre_string_utils.c" >
 					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
@@ -499,16 +479,6 @@
 					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
-				<File RelativePath="..\..\..\glib\pcre\pcre_version.c" >
-					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
-					<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
 				<File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" >
 					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" AdditionalOptions="-DG_LOG_DOMAIN=\&quot;GLib-GRegex\&quot; -UBSR_ANYCRLF -UEBCDIC" /></FileConfiguration>
 					<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-- 
2.7.4