[glib] Visual Studio Projects: Cleanup Property Sheets

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib] Visual Studio Projects: Cleanup Property Sheets
Date: Fri, 27 Dec 2013 04:25:35 +0000 (UTC)
commit ddc29a903644dfcb737c5a17a35081fc76d348e9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Dec 27 12:25:18 2013 +0800

    Visual Studio Projects: Cleanup Property Sheets
    
    Make the projects include a single property sheet as necessary, which will
    in turn include the other property sheet(s) as needed, so that we can avoid
    warnings where we include the same property sheets twice in a single
    project.
    
    Also make the copying of pre-configured headers into custom build rules so
    that they can be removed upon the clean command from the IDE and that they
    can be re-copied if their counterpart *.h.win32 are updated.

 build/win32/vs10/Makefile.am              |    2 +-
 build/win32/vs10/gio.vcxproj.filtersin    |    3 +
 build/win32/vs10/gio.vcxprojin            |   24 +++-
 build/win32/vs10/glib-build-defines.props |    2 +-
 build/win32/vs10/glib-gen-srcs.props      |   29 ++++
 build/win32/vs10/glib-install.props       |  249 +++++++++++++++--------------
 build/win32/vs10/glib-version-paths.props |    2 +-
 build/win32/vs10/glib.vcxproj.filtersin   |    4 +
 build/win32/vs10/glib.vcxprojin           |   78 +++++++--
 build/win32/vs10/glibprepbuild.props      |   39 -----
 build/win32/vs10/gmodule.vcxproj          |   24 +++-
 build/win32/vs10/gmodule.vcxproj.filters  |    3 +
 build/win32/vs10/install.vcxproj          |    4 -
 build/win32/vs9/Makefile.am               |    2 +-
 build/win32/vs9/gio.vcprojin              |   42 +++++-
 build/win32/vs9/glib-gen-srcs.vsprops     |   32 ++++
 build/win32/vs9/glib-install.vsprops      |  138 ++++++++--------
 build/win32/vs9/glib.vcprojin             |  148 ++++++++++++++++-
 build/win32/vs9/glibprepbuild.vsprops     |   27 ---
 build/win32/vs9/gmodule.vcproj            |   42 +++++-
 build/win32/vs9/install.vcproj            |    8 +-
 21 files changed, 593 insertions(+), 309 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index c254812..e71be5d 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -41,4 +41,4 @@ EXTRA_DIST = \
        glib-build-defines.props        \
        glib-install.props      \
        glib-version-paths.props        \
-       glibprepbuild.props
+       glib-gen-srcs.props
diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin
index 02a7ccf..155a4d9 100644
--- a/build/win32/vs10/gio.vcxproj.filtersin
+++ b/build/win32/vs10/gio.vcxproj.filtersin
@@ -18,6 +18,9 @@
 #include "libgio.vs10.sourcefiles.filters"
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\gio\gio.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin
index 86faab3..5a968e5 100644
--- a/build/win32/vs10/gio.vcxprojin
+++ b/build/win32/vs10/gio.vcxprojin
@@ -50,19 +50,19 @@
   </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-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -177,6 +177,22 @@
 #include "libgio.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\gio\gnetworking.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gnetworking.h from 
gnetworking.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGNetworkingH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gnetworking.h from 
gnetworking.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGNetworkingH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gnetworking.h from 
gnetworking.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGNetworkingH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gnetworking.h from 
gnetworking.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGNetworkingH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\gio\gio.rc" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/glib-build-defines.props b/build/win32/vs10/glib-build-defines.props
index d67244b..83ecd8b 100644
--- a/build/win32/vs10/glib-build-defines.props
+++ b/build/win32/vs10/glib-build-defines.props
@@ -67,4 +67,4 @@
       <Value>$(WindowsNetworkingLibs)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/glib-gen-srcs.props b/build/win32/vs10/glib-gen-srcs.props
new file mode 100644
index 0000000..c79b215
--- /dev/null
+++ b/build/win32/vs10/glib-gen-srcs.props
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="glib-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
+    <GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH>
+    <GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 
..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
+    <GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GenConfigH">
+      <Value>$(GenConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGLibConfigH">
+      <Value>$(GenGLibConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGModuleConfH">
+      <Value>$(GenGModuleConfH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGNetworkingH">
+      <Value>$(GenGNetworkingH)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/glib-install.props b/build/win32/vs10/glib-install.props
index 8daf5d2..0a55052 100644
--- a/build/win32/vs10/glib-install.props
+++ b/build/win32/vs10/glib-install.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <ImportGroup Label="PropertySheets">
-    <Import Project="glib-version-paths.props" />
+    <Import Project="glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <GlibDoInstall>
@@ -30,15 +30,24 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\gdbus.exe $(CopyDir)\bin
 copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
 
 
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+
 
 copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
 
 copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
 
-
 copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
 
+copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
+
+
 copy ..\..\..\glib\galloca.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\garray.h $(CopyDir)\include\glib-$(ApiVersion)\glib
@@ -87,10 +96,10 @@ copy ..\..\..\glib\ghook.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\ghostutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib
-
 copy ..\..\..\glib\gi18n.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
+copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib
+
 copy ..\..\..\glib\giochannel.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gkeyfile.h $(CopyDir)\include\glib-$(ApiVersion)\glib
@@ -119,8 +128,6 @@ copy ..\..\..\glib\gpoll.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gprimes.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib
-
 copy ..\..\..\glib\gqsort.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gquark.h $(CopyDir)\include\glib-$(ApiVersion)\glib
@@ -145,13 +152,13 @@ copy ..\..\..\glib\gspawn.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gstdio.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib
-
 copy ..\..\..\glib\gstrfuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
+copy ..\..\..\glib\gtestutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib
+
 copy ..\..\..\glib\gstring.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-copy ..\..\..\glib\gtestutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib
+copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
@@ -173,18 +180,17 @@ copy ..\..\..\glib\gurifuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib
-
 copy ..\..\..\glib\gvarianttype.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
+copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib
+
 copy ..\..\..\glib\gversion.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gversionmacros.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\gwin32.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
+copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib
 
 copy ..\..\..\glib\deprecated\gallocator.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 
@@ -198,11 +204,7 @@ copy ..\..\..\glib\deprecated\grel.h $(CopyDir)\include\glib-$(ApiVersion)\glib\
 
 copy ..\..\..\glib\deprecated\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 
-
-copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
-
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
+copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
 copy ..\..\..\gobject\gbinding.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
@@ -212,14 +214,10 @@ copy ..\..\..\gobject\gclosure.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
 copy ..\..\..\gobject\genums.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
-copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
-
 copy ..\..\..\gobject\gmarshal.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
 copy ..\..\..\gobject\gobject.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
-copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
-
 copy ..\..\..\gobject\gparam.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
 copy ..\..\..\gobject\gparamspecs.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
@@ -242,23 +240,10 @@ copy ..\..\..\gobject\gvaluecollector.h $(CopyDir)\include\glib-$(ApiVersion)\go
 
 copy ..\..\..\gobject\gvaluetypes.h $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
 
 copy ..\..\..\gio\gappinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gasyncinitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio
@@ -271,66 +256,20 @@ copy ..\..\..\gio\gbytesicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gcancellable.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gcontenttype.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gconverterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gconverteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gdatainputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gdataoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gdrive.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gemblem.h $(CopyDir)\include\glib-$(ApiVersion)\gio
@@ -349,35 +288,35 @@ copy ..\..\..\gio\gfileinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gfileinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gfilemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gfilenamecompleter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gfileoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gfilterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gfilteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\ginetaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\ginetsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\ginetsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\ginputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gio.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gioenums.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\gioenums.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gioerror.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
@@ -387,22 +326,14 @@ copy ..\..\..\gio\gioscheduler.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\giostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gloadableicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gmemoryinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gmemoryoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gmountoperation.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gnativevolumemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio
@@ -423,38 +354,24 @@ copy ..\..\..\gio\gpollableoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\
 
 copy ..\..\..\gio\gpollableutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\gproxyaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gproxyaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gproxyaddressenumerator.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gresource.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gseekable.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gsimpleasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
-copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gsimplepermission.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gsocket.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
@@ -475,18 +392,22 @@ copy ..\..\..\gio\gsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gsrvtarget.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gtask.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gsubprocess.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsubprocesslauncher.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
 copy ..\..\..\gio\gtcpconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gtcpwrapperconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+copy ..\..\..\gio\gthreadedsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gthemedicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-copy ..\..\..\gio\gthreadedsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio
-
 copy ..\..\..\gio\gtlsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gtlscertificate.h $(CopyDir)\include\glib-$(ApiVersion)\gio
@@ -515,14 +436,98 @@ copy ..\..\..\gio\gzlibcompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gzlibdecompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
+copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
-mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gnotification.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsettingsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio
+
+copy ..\..\..\gio\gnetworking.h $(CopyDir)\include\glib-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 
 copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
 
 
+
 mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include
 
 copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
diff --git a/build/win32/vs10/glib-version-paths.props b/build/win32/vs10/glib-version-paths.props
index f43c632..d819828 100644
--- a/build/win32/vs10/glib-version-paths.props
+++ b/build/win32/vs10/glib-version-paths.props
@@ -47,4 +47,4 @@
       <Value>$(GlibDllSuffix)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index 8262d2f..fc40dc9 100644
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -108,6 +108,10 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\glib\glibconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\glib\glib.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index d76f1fa..3fd8e43 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -89,43 +89,35 @@
   </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="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <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="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glibprepbuild.props" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -531,6 +523,60 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <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|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|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|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|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|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|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|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>
     <ResourceCompile Include="..\..\..\glib\glib.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs10/gmodule.vcxproj b/build/win32/vs10/gmodule.vcxproj
index 8e71817..71141fa 100644
--- a/build/win32/vs10/gmodule.vcxproj
+++ b/build/win32/vs10/gmodule.vcxproj
@@ -51,19 +51,19 @@
   </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-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
+    <Import Project="glib-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -170,6 +170,22 @@
     <ClCompile Include="..\..\..\gmodule\gmodule.c" />
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gmoduleconf.h from 
gmoduleconf.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGModuleConfH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gmoduleconf.h from 
gmoduleconf.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGModuleConfH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gmoduleconf.h from 
gmoduleconf.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGModuleConfH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gmoduleconf.h from 
gmoduleconf.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGModuleConfH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\gmodule\gmodule.rc" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/build/win32/vs10/gmodule.vcxproj.filters
index ceab446..968e8ac 100644
--- a/build/win32/vs10/gmodule.vcxproj.filters
+++ b/build/win32/vs10/gmodule.vcxproj.filters
@@ -20,6 +20,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\gmodule\gmodule.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index d2cb450..0663334 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -52,22 +52,18 @@
   <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-install.props" />
-    <Import Project="glib-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-install.props" />
-    <Import Project="glib-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-install.props" />
-    <Import Project="glib-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="glib-install.props" />
-    <Import Project="glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index cdca801..a998bfc 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -23,4 +23,4 @@ EXTRA_DIST = \
        glib-build-defines.vsprops      \
        glib-install.vsprops    \
        glib-version-paths.vsprops      \
-       glibprepbuild.vsprops
+       glib-gen-srcs.vsprops
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index 0b9308a..cb8ca32 100644
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -20,7 +20,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -52,7 +52,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -84,7 +84,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -116,7 +116,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -168,6 +168,40 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
+                       <File RelativePath="..\..\..\gio\gnetworking.h.win32">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gnetworking.h from 
gnetworking.h.win32..."
+                                               CommandLine="$(GenGNetworkingH)"
+                                               Outputs="..\..\..\gio\gnetworking.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gnetworking.h from 
gnetworking.h.win32..."
+                                               CommandLine="$(GenGNetworkingH)"
+                                               Outputs="..\..\..\gio\gnetworking.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gnetworking.h from 
gnetworking.h.win32..."
+                                               CommandLine="$(GenGNetworkingH)"
+                                               Outputs="..\..\..\gio\gnetworking.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gnetworking.h from 
gnetworking.h.win32..."
+                                               CommandLine="$(GenGNetworkingH)"
+                                               Outputs="..\..\..\gio\gnetworking.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\gio\gio.rc" />
                </Filter>
        </Files>
diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/build/win32/vs9/glib-gen-srcs.vsprops
new file mode 100644
index 0000000..7df2d21
--- /dev/null
+++ b/build/win32/vs9/glib-gen-srcs.vsprops
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="glibgensrcsprops"
+       InheritedPropertySheets=".\glib-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="GenConfigH"
+               Value="
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+                     "
+       />
+       <UserMacro
+               Name="GenGLibConfigH"
+               Value="
+copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h
+                     "
+       />
+       <UserMacro
+               Name="GenGModuleConfH"
+               Value="
+copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
+                     "
+       />
+       <UserMacro
+               Name="GenGNetworkingH"
+               Value="
+copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h
+                     "
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-install.vsprops b/build/win32/vs9/glib-install.vsprops
index 7f4313c..11fdeb9 100644
--- a/build/win32/vs9/glib-install.vsprops
+++ b/build/win32/vs9/glib-install.vsprops
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"
        Version="8.00"
        Name="glibinstallprops"
-       InheritedPropertySheets=".\glib-version-paths.vsprops"
+       InheritedPropertySheets=".\glib-build-defines.vsprops"
        >
        <UserMacro
                Name="GlibDoInstall"
@@ -21,11 +21,16 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.exe
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
+
 copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
 copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-
 copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
+copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
+
 copy ..\..\..\glib\galloca.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\garray.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gasyncqueue.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
@@ -50,8 +55,8 @@ copy ..\..\..\glib\ghash.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A
 copy ..\..\..\glib\ghmac.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\ghook.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\ghostutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gi18n.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\giochannel.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gkeyfile.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\glist.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
@@ -66,7 +71,6 @@ copy ..\..\..\glib\goption.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x
 copy ..\..\..\glib\gpattern.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gpoll.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gprimes.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gqsort.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gquark.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gqueue.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
@@ -79,10 +83,10 @@ copy ..\..\..\glib\gslice.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0
 copy ..\..\..\glib\gslist.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gspawn.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gstdio.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gstrfuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-copy ..\..\..\glib\gstring.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gtestutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gstring.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gthreadpool.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gtimer.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
@@ -93,31 +97,25 @@ copy ..\..\..\glib\gtypes.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0
 copy ..\..\..\glib\gunicode.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gurifuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gvarianttype.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gversion.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gversionmacros.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gwin32.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
+copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\gallocator.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\gcache.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\gcompletion.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\gmain.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\grel.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
 copy ..\..\..\glib\deprecated\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
-
-copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gbinding.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gboxed.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gclosure.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\genums.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
-copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gmarshal.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gobject.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
-copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gparam.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gparamspecs.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gsignal.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
@@ -129,51 +127,21 @@ copy ..\..\..\gobject\gvalue.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0
 copy ..\..\..\gobject\gvaluearray.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gvaluecollector.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gobject\gvaluetypes.h $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject&#x0D;&#x0A;
 copy ..\..\..\gio\gappinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gasyncinitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gbufferedinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gbufferedoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gbytesicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gcancellable.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gcontenttype.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gconverterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gconverteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gdatainputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gdataoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gdrive.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gemblem.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gemblemedicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
@@ -183,33 +151,29 @@ copy ..\..\..\gio\gfileenumerator.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x
 copy ..\..\..\gio\gfileicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfileinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfileinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfilemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfilenamecompleter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfileoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfilterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfilteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\ginetaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\ginetsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\ginputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gio.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gioenums.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gioerror.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\giomodule.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gioscheduler.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\giostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gloadableicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gmemoryinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gmemoryoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gmountoperation.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gnativevolumemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gnetworkaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
@@ -220,22 +184,15 @@ copy ..\..\..\gio\gpermission.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&
 copy ..\..\..\gio\gpollableinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gpollableoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gpollableutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gproxyaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gproxyaddressenumerator.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gresource.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gseekable.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsimpleasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsimplepermission.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsocket.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsocketaddressenumerator.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
@@ -246,12 +203,14 @@ copy ..\..\..\gio\gsocketcontrolmessage.h $(CopyDir)\include\glib-$(ApiVersion)\
 copy ..\..\..\gio\gsocketlistener.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gsrvtarget.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtask.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsubprocess.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsubprocesslauncher.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtcpconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtcpwrapperconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-copy ..\..\..\gio\gthemedicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gthreadedsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gthemedicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtlsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtlscertificate.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gtlsclientconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
@@ -266,8 +225,49 @@ copy ..\..\..\gio\gvolume.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A
 copy ..\..\..\gio\gvolumemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gzlibcompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gzlibdecompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gnotification.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsettingsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gnetworking.h $(CopyDir)\include\glib-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio&#x0D;&#x0A;
 
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index 16db864..4e56312 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -52,7 +52,7 @@
                </Configuration>
                <Configuration
                        Name="Debug_ExtPCRE|Win32"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -84,7 +84,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -115,7 +115,7 @@
                </Configuration>
                <Configuration
                        Name="Debug_ExtPCRE|x64"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -147,7 +147,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -178,7 +178,7 @@
                </Configuration>
                <Configuration
                        Name="Release_ExtPCRE|Win32"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -210,7 +210,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -241,7 +241,7 @@
                </Configuration>
                <Configuration
                        Name="Release_ExtPCRE|x64"
-                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -494,6 +494,138 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
+                       <File RelativePath="..\..\..\config.h.win32">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_ExtPCRE|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release_ExtPCRE|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_ExtPCRE|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release_ExtPCRE|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\glib\glibconfig.h.win32">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_ExtPCRE|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release_ExtPCRE|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_ExtPCRE|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release_ExtPCRE|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying glibconfig.h from glibconfig.h.win32..."
+                                               CommandLine="$(GenGLibConfigH)"
+                                               Outputs="..\..\..\glib\glibconfig.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\glib\glib.rc" />
                </Filter>
        </Files>
diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj
index db1a1a4..4f33b6e 100644
--- a/build/win32/vs9/gmodule.vcproj
+++ b/build/win32/vs9/gmodule.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -51,7 +51,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -81,7 +81,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -111,7 +111,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -161,6 +161,40 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
+                       <File RelativePath="..\..\..\gmodule\gmoduleconf.h.win32">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gmoduleconf.h from 
gmoduleconf.h.win32..."
+                                               CommandLine="$(GenGModuleConfH)"
+                                               Outputs="..\..\..\gmodule\gmoduleconf.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gmoduleconf.h from 
gmoduleconf.h.win32..."
+                                               CommandLine="$(GenGModuleConfH)"
+                                               Outputs="..\..\..\gmodule\gmoduleconf.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gmoduleconf.h from 
gmoduleconf.h.win32..."
+                                               CommandLine="$(GenGModuleConfH)"
+                                               Outputs="..\..\..\gmodule\gmoduleconf.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying gmoduleconf.h from 
gmoduleconf.h.win32..."
+                                               CommandLine="$(GenGModuleConfH)"
+                                               Outputs="..\..\..\gmodule\gmoduleconf.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\gmodule\gmodule.rc" />
                </Filter>
        </Files>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index d203aa7..19a124c 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib-install.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -34,7 +34,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib-install.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -47,7 +47,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib-install.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -61,7 +61,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib-install.vsprops;.\glib-build-defines.vsprops"
+                       InheritedPropertySheets=".\glib-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]