[glib] Visual Studio builds: Rearrange build configs



commit e3ab6ab38a69fe20f182703052387fa1cad21205
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jan 18 16:04:45 2016 +0800

    Visual Studio builds: Rearrange build configs
    
    This is a follow-up commit for commit 82c2461, where the default build is
    to use the PCRE that is installed in the system, if it is available and is
    not overridden with --with-internal-pcre.
    
    For Visual Studio builds, this means that the new 'Debug' and 'Release'
    configs will now use PCRE that is found on the system, which were renamed
    from the '*_ExtPCRE' configs; and that there are now 'Debug_BundledPCRE'
    and 'Release_BundledPCRE' configs which make use of the PCRE that is
    supplied with the GLib sources, which, replaces the former 'Debug' and
    'Release' configs.

 build/win32/vs10/glib.sln       |  248 +++++++++---------
 build/win32/vs10/glib.vcxprojin |  550 +++++++++++++++++++-------------------
 build/win32/vs9/glib.sln        |  248 +++++++++---------
 build/win32/vs9/glib.vcprojin   |  336 ++++++++++++------------
 4 files changed, 691 insertions(+), 691 deletions(-)
---
diff --git a/build/win32/vs10/glib.sln b/build/win32/vs10/glib.sln
index 89dd8b6..12b0d64 100644
--- a/build/win32/vs10/glib.sln
+++ b/build/win32/vs10/glib.sln
@@ -32,256 +32,256 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcxproj", "{
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug_ExtPCRE|Win32 = Debug_ExtPCRE|Win32
-               Debug_ExtPCRE|x64 = Debug_ExtPCRE|x64
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
-               Release_ExtPCRE|Win32 = Release_ExtPCRE|Win32
-               Release_ExtPCRE|x64 = Release_ExtPCRE|x64
+               Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32
+               Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64
                Release|Win32 = Release|Win32
                Release|x64 = Release|x64
+               Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32
+               Release_BundledPCRE|x64 = Release_BundledPCRE|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|Win32.ActiveCfg = Debug_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|Win32.Build.0 = Debug_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|x64.ActiveCfg = Debug_ExtPCRE|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|x64.Build.0 = Debug_ExtPCRE|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.Build.0 = Debug|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|Win32.ActiveCfg = Release_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|Win32.Build.0 = Release_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|x64.ActiveCfg = Release_ExtPCRE|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|x64.Build.0 = Release_ExtPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = 
Debug_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = 
Debug_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = 
Release_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = 
Release_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = 
Release_BundledPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = 
Release_BundledPCRE|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.Build.0 = Debug|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.Build.0 = Debug|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.Build.0 = Debug|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.ActiveCfg = Debug|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.Build.0 = Debug|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|x64.ActiveCfg = Debug|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|x64.Build.0 = Debug|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.ActiveCfg = Release|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.Build.0 = Release|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.ActiveCfg = Release|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.Build.0 = Release|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.Build.0 = Debug|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.Build.0 = Debug|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.Build.0 = Debug|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.Build.0 = Debug|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.ActiveCfg = Release|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.Build.0 = Debug|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.ActiveCfg = Release|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.ActiveCfg = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.ActiveCfg = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index 03ba749..36e7d7a 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_ExtPCRE|Win32">
-      <Configuration>Debug_ExtPCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_ExtPCRE|x64">
-      <Configuration>Debug_ExtPCRE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -17,12 +9,12 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_ExtPCRE|Win32">
-      <Configuration>Release_ExtPCRE</Configuration>
+    <ProjectConfiguration Include="Debug_BundledPCRE|Win32">
+      <Configuration>Debug_BundledPCRE</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_ExtPCRE|x64">
-      <Configuration>Release_ExtPCRE</Configuration>
+    <ProjectConfiguration Include="Debug_BundledPCRE|x64">
+      <Configuration>Debug_BundledPCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
@@ -33,6 +25,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_BundledPCRE|Win32">
+      <Configuration>Release_BundledPCRE</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_BundledPCRE|x64">
+      <Configuration>Release_BundledPCRE</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{12BCA020-EABF-429E-876A-A476BC9C10C0}</ProjectGuid>
@@ -40,46 +40,46 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
@@ -87,15 +87,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-gen-srcs.props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'" 
Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
@@ -103,7 +99,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
@@ -111,7 +107,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
@@ -119,22 +115,26 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="glib-gen-srcs.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">true</LinkIncremental>
+    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Debug\$(Platform)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">true</LinkIncremental>
+    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Debug\$(Platform)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">false</LinkIncremental>
+    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Release\$(Platform)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">false</LinkIncremental>
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">Release\$(Platform)\bin\</OutDir>
+    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">false</LinkIncremental>
+    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Release\$(Platform)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">false</LinkIncremental>
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">Release\$(Platform)\bin\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -160,7 +160,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -186,7 +186,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -212,7 +212,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -238,7 +238,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -263,7 +263,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       
<PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -288,7 +288,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">
     <ClCompile>
       <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -313,7 +313,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       
<PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -345,14 +345,14 @@
     <ClCompile Include="..\..\..\glib\gthread-win32.c" />
     <ClCompile Include="..\..\..\glib\gwin32.c" />
     <ClCompile Include="..\..\..\glib\libcharset\localcharset.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\gnulib\asnprintf.c" />
     <ClCompile Include="..\..\..\glib\gnulib\printf-args.c" />
@@ -360,296 +360,296 @@
     <ClCompile Include="..\..\..\glib\gnulib\printf.c" />
     <ClCompile Include="..\..\..\glib\gnulib\vasnprintf.c" />
     <ClCompile Include="..\..\..\glib\pcre\pcre_byte_order.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_chartables.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_compile.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_config.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_dfa_exec.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_exec.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_fullinfo.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_get.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_globals.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_jit_compile.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_newline.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_ord2utf8.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_string_utils.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_study.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_tables.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) 
%(AdditionalOptions)</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from 
config.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from 
config.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenConfigH)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from 
config.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from 
config.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">..\..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\glib\glibconfig.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">Copying glibconfig.h 
from glibconfig.h.win32...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GenGLibConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGLibConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">$(GenGLibConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GenGLibConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGLibConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">$(GenGLibConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">Copying glibconfig.h 
from glibconfig.h.win32...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GenGLibConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGLibConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">$(GenGLibConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">Copying glibconfig.h 
from glibconfig.h.win32...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GenGLibConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGLibConfigH)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">Copying glibconfig.h from 
glibconfig.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">$(GenGLibConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">..\..\..\glib\glibconfig.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs9/glib.sln b/build/win32/vs9/glib.sln
index 1a784f5..76c0648 100644
--- a/build/win32/vs9/glib.sln
+++ b/build/win32/vs9/glib.sln
@@ -103,16 +103,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-instal
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32
+               Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64
+               Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32
+               Release_BundledPCRE|x64 = Release_BundledPCRE|x64
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
                Release|Win32 = Release|Win32
                Release|x64 = Release|x64
-               Debug_ExtPCRE|Win32 = Debug_ExtPCRE|Win32
-               Debug_ExtPCRE|x64 = Debug_ExtPCRE|x64
-               Release_ExtPCRE|Win32 = Release_ExtPCRE|Win32
-               Release_ExtPCRE|x64 = Release_ExtPCRE|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = 
Debug_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = 
Debug_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = 
Release_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = 
Release_BundledPCRE|Win32
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = 
Release_BundledPCRE|x64
+               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = 
Release_BundledPCRE|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,14 +129,14 @@ Global
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64
                {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|Win32.ActiveCfg = Debug_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|Win32.Build.0 = Debug_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|x64.ActiveCfg = Debug_ExtPCRE|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_ExtPCRE|x64.Build.0 = Debug_ExtPCRE|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|Win32.ActiveCfg = Release_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|Win32.Build.0 = Release_ExtPCRE|Win32
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|x64.ActiveCfg = Release_ExtPCRE|x64
-               {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_ExtPCRE|x64.Build.0 = Release_ExtPCRE|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64
@@ -137,14 +145,14 @@ Global
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64
                {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64
@@ -153,14 +161,14 @@ Global
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64
                {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,14 +177,14 @@ Global
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64
                {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.ActiveCfg = Debug|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.Build.0 = Debug|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|x64.ActiveCfg = Debug|x64
@@ -185,14 +193,14 @@ Global
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.Build.0 = Release|Win32
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.ActiveCfg = Release|x64
                {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.Build.0 = Release|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64
@@ -201,14 +209,14 @@ Global
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64
                {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,14 +225,14 @@ Global
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64
                {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {289240E7-E167-47CE-A20C-58D852E520BA}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64
@@ -233,14 +241,14 @@ Global
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64
                {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64
@@ -249,14 +257,14 @@ Global
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64
                {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,14 +273,14 @@ Global
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64
                {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64
@@ -281,14 +289,14 @@ Global
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64
                {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64
@@ -297,14 +305,14 @@ Global
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64
@@ -313,14 +321,14 @@ Global
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64
@@ -329,14 +337,14 @@ Global
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64
                {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_ExtPCRE|x64.Build.0 = Release|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
+               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
@@ -345,14 +353,6 @@ Global
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
                {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_ExtPCRE|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index 170d43e..00c2284 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -20,8 +20,9 @@
        </ToolFiles>
        <Configurations>
                <Configuration
-                       Name="Debug|Win32"
+                       Name="Debug_BundledPCRE|Win32"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+                       OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -51,9 +52,8 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug_ExtPCRE|Win32"
+                       Name="Debug|Win32"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-                       OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -83,8 +83,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Debug_BundledPCRE|x64"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+                       OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -114,9 +115,8 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug_ExtPCRE|x64"
+                       Name="Debug|x64"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-                       OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -146,8 +146,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Release_BundledPCRE|Win32"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+                       OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -177,9 +178,8 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release_ExtPCRE|Win32"
+                       Name="Release|Win32"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-                       OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -209,8 +209,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Release_BundledPCRE|x64"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+                       OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -240,9 +241,8 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release_ExtPCRE|x64"
+                       Name="Release|x64"
                        InheritedPropertySheets=".\glib-gen-srcs.vsprops"
-                       OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -289,14 +289,14 @@
                                Name="libcharset"
                                >
                                <File RelativePath="..\..\..\glib\libcharset\localcharset.c">
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
                                        <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
                                        <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
                                        <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
                                        <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
                                </File>
                        </Filter>
                        <Filter
@@ -312,174 +312,174 @@
                                Name="pcre"
                                >
                                <File RelativePath="..\..\..\glib\pcre\pcre_byte_order.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_chartables.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_compile.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_config.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_exec.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_get.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_globals.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_jit_compile.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_newline.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_string_utils.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_study.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_tables.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                                <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" >
-                                       <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|Win32" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Debug_ExtPCRE|x64" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
-                                       <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" 
/></FileConfiguration>
-                                       <FileConfiguration Name="Release_ExtPCRE|x64" 
ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|Win32"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" 
<Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
+                                       <FileConfiguration Name="Release_BundledPCRE|x64"><Tool 
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" 
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
+                                       <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool 
Name="VCCLCompilerTool" /></FileConfiguration>
                                </File>
                        </Filter>
                </Filter>
@@ -495,7 +495,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                        <File RelativePath="..\..\..\config.h.win32">
-                               <FileConfiguration Name="Debug|Win32">
+                               <FileConfiguration Name="Debug_BundledPCRE|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -503,7 +503,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug_ExtPCRE|Win32">
+                               <FileConfiguration Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -511,7 +511,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
+                               <FileConfiguration Name="Release_BundledPCRE|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -519,7 +519,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release_ExtPCRE|Win32">
+                               <FileConfiguration Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -527,7 +527,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
+                               <FileConfiguration Name="Debug_BundledPCRE|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -535,7 +535,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug_ExtPCRE|x64">
+                               <FileConfiguration Name="Debug|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -543,7 +543,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
+                               <FileConfiguration Name="Release_BundledPCRE|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -551,7 +551,7 @@
                                                Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release_ExtPCRE|x64">
+                               <FileConfiguration Name="Release|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
@@ -561,7 +561,7 @@
                                </FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\glib\glibconfig.h.win32">
-                               <FileConfiguration Name="Debug|Win32">
+                               <FileConfiguration Name="Debug_BundledPCRE|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -569,7 +569,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug_ExtPCRE|Win32">
+                               <FileConfiguration Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -577,7 +577,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
+                               <FileConfiguration Name="Release_BundledPCRE|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -585,7 +585,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release_ExtPCRE|Win32">
+                               <FileConfiguration Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -593,7 +593,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
+                               <FileConfiguration Name="Debug_BundledPCRE|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -601,7 +601,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Debug_ExtPCRE|x64">
+                               <FileConfiguration Name="Debug|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -609,7 +609,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
+                               <FileConfiguration Name="Release_BundledPCRE|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."
@@ -617,7 +617,7 @@
                                                Outputs="..\..\..\glib\glibconfig.h"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration Name="Release_ExtPCRE|x64">
+                               <FileConfiguration Name="Release|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Copying glibconfig.h from glibconfig.h.win32..."


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]