GNOME.org
 

[gdk-pixbuf] Visual Studio Projects: Split the Property Sheets

commit 369a828af6ed09e7f4160cb353b9f9de2dfe495c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Dec 26 19:37:08 2013 +0800

    Visual Studio Projects: Split the Property Sheets
    
    Split up the Visual Studio 2008/2010 property sheets, so that they can be
    more easily maintained; also remove items that aren't really needed for the
    build and merge a few items that are frequently repeated.
    
    Also make the copying of config.h from config.h.win32 done with a custom
    build rule so that we have a clean source tree when cleaning the build from
    the IDE.

 build/win32/vs10/Makefile.am                      |   30 ++--
 build/win32/vs10/gdk-pixbuf-build-defines.props   |   62 +++++++
 build/win32/vs10/gdk-pixbuf-csource.vcxproj       |    8 +-
 build/win32/vs10/gdk-pixbuf-gen-srcs.props        |   21 +++
 build/win32/vs10/gdk-pixbuf-gengir.props          |   26 +++
 build/win32/vs10/gdk-pixbuf-install.props         |   55 +++++++
 build/win32/vs10/gdk-pixbuf-pixdata.vcxproj       |    8 +-
 build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj |    8 +-
 build/win32/vs10/gdk-pixbuf-version-paths.props   |   54 ++++++
 build/win32/vs10/gdk-pixbuf.props                 |  180 ---------------------
 build/win32/vs10/gdk-pixbuf.vcxprojin             |   74 ++++++---
 build/win32/vs10/gengir.vcxproj                   |    8 +-
 build/win32/vs10/install.vcxproj                  |    8 +-
 build/win32/vs9/Makefile.am                       |   22 ++-
 build/win32/vs9/gdk-pixbuf-build-defines.vsprops  |   57 +++++++
 build/win32/vs9/gdk-pixbuf-csource.vcproj         |    8 +-
 build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops       |   16 ++
 build/win32/vs9/gdk-pixbuf-gengir.vsprops         |   21 +++
 build/win32/vs9/gdk-pixbuf-install.vsprops        |   32 ++++
 build/win32/vs9/gdk-pixbuf-pixdata.vcproj         |    8 +-
 build/win32/vs9/gdk-pixbuf-query-loaders.vcproj   |    8 +-
 build/win32/vs9/gdk-pixbuf-version-paths.vsprops  |   53 ++++++
 build/win32/vs9/gdk-pixbuf.vcprojin               |  114 ++++++++++---
 build/win32/vs9/gdk-pixbuf.vsprops                |  157 ------------------
 build/win32/vs9/gengir.vcproj                     |    8 +-
 build/win32/vs9/install.vcproj                    |    8 +-
 26 files changed, 607 insertions(+), 447 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 3206755..ab59366 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,17 +1,21 @@
 EXTRA_DIST = \
-       README.txt \
-       gdk-pixbuf.sln \
-       gdk-pixbuf.props \
-       gdk-pixbuf.vcxproj \
-       gdk-pixbuf.vcxprojin \
-       gdk-pixbuf.vcxproj.filters \
-       gdk-pixbuf.vcxproj.filtersin \
-       gdk-pixbuf-csource.vcxproj \
-       gdk-pixbuf-csource.vcxproj.filters \
-       gdk-pixbuf-query-loaders.vcxproj \
-       gdk-pixbuf-query-loaders.vcxproj.filters \
-       gdk-pixbuf-pixdata.vcxproj \
-       gdk-pixbuf-pixdata.vcxproj.filters \
+       README.txt      \
+       gdk-pixbuf.sln  \
+       gdk-pixbuf-version-paths.props  \
+       gdk-pixbuf-build-defines.props  \
+       gdk-pixbuf-gen-srcs.props       \
+       gdk-pixbuf-gengir.props \
+       gdk-pixbuf-install.props        \
+       gdk-pixbuf.vcxproj      \
+       gdk-pixbuf.vcxprojin    \
+       gdk-pixbuf.vcxproj.filters      \
+       gdk-pixbuf.vcxproj.filtersin    \
+       gdk-pixbuf-csource.vcxproj      \
+       gdk-pixbuf-csource.vcxproj.filters      \
+       gdk-pixbuf-query-loaders.vcxproj        \
+       gdk-pixbuf-query-loaders.vcxproj.filters        \
+       gdk-pixbuf-pixdata.vcxproj      \
+       gdk-pixbuf-pixdata.vcxproj.filters      \
        install.vcxproj \
        gengir.vcxproj
 
diff --git a/build/win32/vs10/gdk-pixbuf-build-defines.props b/build/win32/vs10/gdk-pixbuf-build-defines.props
new file mode 100644
index 0000000..7370c4e
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-build-defines.props
@@ -0,0 +1,62 @@
+<?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="gdk-pixbuf-version-paths.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GdkPixbufBinaryVersion>2.10.0</GdkPixbufBinaryVersion>
+    <GDIP_MACROS>INCLUDE_gdiplus</GDIP_MACROS>
+    
<NOGDIP_MACROS>JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;</NOGDIP_MACROS>
+    
<MODULAR_MACROS>INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm</MODULAR_MACROS>
+    <GdkPixbufDummyPrefix>/dummy</GdkPixbufDummyPrefix>
+    <GdkPixbufPrefixDefine>GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)"</GdkPixbufPrefixDefine>
+    
<GdkPixbufLibdirDefine>PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders"</GdkPixbufLibdirDefine>
+    <GdkPixbufBinVerDefine>GDK_PIXBUF_BINARY_VERSION="$(GdkPixbufBinaryVersion)"</GdkPixbufBinVerDefine>
+    
<GdkPixbufDefines>HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;$(GdkPixbufPrefixDefine);$(GdkPixbufBinVerDefine);$(MODULAR_MACROS)</GdkPixbufDefines>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gdk-pixbufbuilddefinesprops</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      
<AdditionalIncludeDirectories>..\..\..;..\..\..\gdk-pixbuf;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      
<AdditionalDependencies>gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;gthread-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GdkPixbufBinaryVersion">
+      <Value>$(GdkPixbufBinaryVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GDIP_MACROS">
+      <Value>$(GDIP_MACROS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="NOGDIP_MACROS">
+      <Value>$(NOGDIP_MACROS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MODULAR_MACROS">
+      <Value>$(MODULAR_MACROS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufDummyPrefix">
+      <Value>$(GdkPixbufDummyPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufPrefixDefine">
+      <Value>$(GdkPixbufPrefixDefine)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufLibdirDefine">
+      <Value>$(GdkPixbufLibdirDefine)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufBinVerDefine">
+      <Value>$(GdkPixbufBinVerDefine)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufDefines">
+      <Value>$(GdkPixbufDefines)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-csource.vcxproj b/build/win32/vs10/gdk-pixbuf-csource.vcxproj
index 2171aa5..898492f 100644
--- a/build/win32/vs10/gdk-pixbuf-csource.vcxproj
+++ b/build/win32/vs10/gdk-pixbuf-csource.vcxproj
@@ -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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs10/gdk-pixbuf-gen-srcs.props b/build/win32/vs10/gdk-pixbuf-gen-srcs.props
new file mode 100644
index 0000000..69f247b
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-gen-srcs.props
@@ -0,0 +1,21 @@
+<?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="gdk-pixbuf-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GenerateGdkPixbufDef>echo EXPORTS &gt;$(DefDir)\gdk-pixbuf.def &amp;&amp; cl /EP -DG_OS_WIN32 
-DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= 
..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;$(DefDir)\gdk-pixbuf.def</GenerateGdkPixbufDef>
+    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gdk-pixbufgensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GenerateGdkPixbufDef">
+      <Value>$(GenerateGdkPixbufDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenConfigH">
+      <Value>$(GenConfigH)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/gdk-pixbuf-gengir.props b/build/win32/vs10/gdk-pixbuf-gengir.props
new file mode 100644
index 0000000..bf515e0
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-gengir.props
@@ -0,0 +1,26 @@
+<?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="gdk-pixbuf-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <DoGenGir>
+set VSVER=$(VSVer)
+set CONF=$(Configuration)
+set PLAT=$(Platform)
+set BASEDIR=$(GlibEtcInstallRoot)
+cd ..
+call gengir_gdkpixbuf.bat
+
+cd vs$(VSVer)
+    </DoGenGir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gdk-pixbufgengirprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="DoGenGir">
+      <Value>$(DoGenGir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/gdk-pixbuf-install.props b/build/win32/vs10/gdk-pixbuf-install.props
new file mode 100644
index 0000000..c39e08b
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-install.props
@@ -0,0 +1,55 @@
+<?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="gdk-pixbuf-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GdkPixbufDoInstall>
+echo on
+
+mkdir $(CopyDir)\bin
+
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+
+mkdir $(CopyDir)\lib
+
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+
+copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
+    </GdkPixbufDoInstall>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gdk-pixbufinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GdkPixbufDoInstall">
+      <Value>$(GdkPixbufDoInstall)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj b/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj
index f646ee9..c23b877 100644
--- a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj
+++ b/build/win32/vs10/gdk-pixbuf-pixdata.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj 
b/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
index 9648184..a87fa5d 100644
--- a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
+++ b/build/win32/vs10/gdk-pixbuf-query-loaders.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs10/gdk-pixbuf-version-paths.props b/build/win32/vs10/gdk-pixbuf-version-paths.props
new file mode 100644
index 0000000..33aee7e
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-version-paths.props
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <ApiVersion>2.0</ApiVersion>
+    <GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
+    <GdkPixbufLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
+    <GdkPixbufSeparateVSDllPrefix />
+    <GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
+    <GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
+    <GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
+    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gdk-versionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufLibtoolCompatibleDllPrefix">
+      <Value>$(GdkPixbufLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufLibtoolCompatibleDllSuffix">
+      <Value>$(GdkPixbufLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufSeparateVSDllPrefix">
+      <Value>$(GdkPixbufSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufSeparateVSDllSuffix">
+      <Value>$(GdkPixbufSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufDllPrefix">
+      <Value>$(GdkPixbufDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufDllSuffix">
+      <Value>$(GdkPixbufDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin
index 59ac99a..8531329 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/build/win32/vs10/gdk-pixbuf.vcxprojin
@@ -85,35 +85,35 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -135,7 +135,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -163,7 +163,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -189,7 +189,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -210,7 +210,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -234,7 +234,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -263,7 +263,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -290,7 +290,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -312,7 +312,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -441,30 +441,56 @@
     </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_NoGDIP|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|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_NoGDIP|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|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_NoGDIP|Win32'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|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_NoGDIP|x64'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(GenConfigH)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">Generating 
gdk-pixbuf.def...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(GenerateGdkPixbufDef)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj
index e8d9d13..39d6ad0 100644
--- a/build/win32/vs10/gengir.vcxproj
+++ b/build/win32/vs10/gengir.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gengir.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gengir.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gengir.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-gengir.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 6d23844..d908597 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-install.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-install.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-install.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="gdk-pixbuf.props" />
+    <Import Project="gdk-pixbuf-install.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f2c6905..f44dae8 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,12 +1,16 @@
-EXTRA_DIST = \
-       README.txt \
-       gdk-pixbuf.sln \
-       gdk-pixbuf.vsprops \
-       gdk-pixbuf.vcproj \
-       gdk-pixbuf.vcprojin \
-       gdk-pixbuf-csource.vcproj \
-       gdk-pixbuf-query-loaders.vcproj \
-       gdk-pixbuf-pixdata.vcproj \
+EXTRA_DIST =   \
+       README.txt      \
+       gdk-pixbuf.sln  \
+       gdk-pixbuf-version-paths.vsprops        \
+       gdk-pixbuf-build-defines.vsprops        \
+       gdk-pixbuf-gen-srcs.vsprops     \
+       gdk-pixbuf-gengir.vsprops       \
+       gdk-pixbuf-install.vsprops      \
+       gdk-pixbuf.vcproj       \
+       gdk-pixbuf.vcprojin     \
+       gdk-pixbuf-csource.vcproj       \
+       gdk-pixbuf-query-loaders.vcproj \
+       gdk-pixbuf-pixdata.vcproj       \
        install.vcproj  \
        gengir.vcproj
 
diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops 
b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
new file mode 100644
index 0000000..534dbf2
--- /dev/null
+++ b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gdk-pixbufbuilddefinesprops"
+       OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+       InheritedPropertySheets=".\gdk-pixbuf-version-paths.vsprops"
+       >
+       <Tool
+               Name="VCCLCompilerTool"
+               
AdditionalIncludeDirectories="..\..\..;..\..\..\gdk-pixbuf;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
+               
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES"
+               ForcedIncludeFiles="msvc_recommended_pragmas.h"
+       />
+       <Tool
+               Name="VCLinkerTool"
+               AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib 
gthread-2.0.lib intl.lib"
+               AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+       />
+       <UserMacro
+               Name="GdkPixbufBinaryVersion"
+               Value="2.10.0"
+       />
+       <UserMacro
+               Name="GDIP_MACROS"
+               Value="INCLUDE_gdiplus"
+       />
+       <UserMacro
+               Name="NOGDIP_MACROS"
+               
Value="JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;"
+       />
+       <UserMacro
+               Name="MODULAR_MACROS"
+               
Value="INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm"
+       />
+       <UserMacro
+               Name="GdkPixbufDummyPrefix"
+               Value="/dummy"
+       />
+       <UserMacro
+               Name="GdkPixbufPrefixDefine"
+               Value="GDK_PIXBUF_PREFIX=&quot;\&quot;$(GdkPixbufDummyPrefix)\&quot;&quot;"
+       />
+       <UserMacro
+               Name="GdkPixbufLibdirDefine"
+               
Value="PIXBUF_LIBDIR=&quot;\&quot;$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders\&quot;&quot;"
+       />
+       <UserMacro
+               Name="GdkPixbufBinVerDefine"
+               Value="GDK_PIXBUF_BINARY_VERSION=&quot;\&quot;$(GdkPixbufBinaryVersion)\&quot;&quot;"
+       />
+       <UserMacro
+               Name="GdkPixbufDefines"
+               
Value="HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;$(GdkPixbufBinVerDefine);$(GdkPixbufPrefixDefine);$(MODULAR_MACROS)"
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf-csource.vcproj b/build/win32/vs9/gdk-pixbuf-csource.vcproj
index a11fb69..ad6a33c 100644
--- a/build/win32/vs9/gdk-pixbuf-csource.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-csource.vcproj
@@ -22,7 +22,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -54,7 +54,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -86,7 +86,7 @@
                <Configuration
                        Name="Debug|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -119,7 +119,7 @@
                <Configuration
                        Name="Release|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
diff --git a/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops b/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
new file mode 100644
index 0000000..610feb2
--- /dev/null
+++ b/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gdk-pixbufgensrcsprops"
+       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="GenConfigH"
+               Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+       />
+       <UserMacro
+               Name="GenerateGdkPixbufDef"
+               Value="echo EXPORTS &gt; $(DefDir)\gdk-pixbuf.def &amp;&amp; cl /EP -DG_OS_WIN32 
-DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= 
..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;$(DefDir)\gdk-pixbuf.def"
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf-gengir.vsprops b/build/win32/vs9/gdk-pixbuf-gengir.vsprops
new file mode 100644
index 0000000..294e253
--- /dev/null
+++ b/build/win32/vs9/gdk-pixbuf-gengir.vsprops
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gdk-pixbufgengirprops"
+       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="DoGenGir"
+               Value="
+set VSVER=$(VSVer)&#x0D;&#x0A;
+set CONF=$(ConfigurationName)&#x0D;&#x0A;
+set PLAT=$(PlatformName)&#x0D;&#x0A;
+set BASEDIR=$(GlibEtcInstallRoot)&#x0D;&#x0A;
+cd ..&#x0D;&#x0A;
+
+call gengir_gdkpixbuf.bat&#x0D;&#x0A;
+cd vs$(VSVer)&#x0D;&#x0A;
+                     "
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf-install.vsprops b/build/win32/vs9/gdk-pixbuf-install.vsprops
new file mode 100644
index 0000000..58a7652
--- /dev/null
+++ b/build/win32/vs9/gdk-pixbuf-install.vsprops
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gdk-pixbufinstallprops"
+       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="GdkPixbufDoInstall"
+               Value="
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h 
$(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+"
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj
index 192480d..6c07e98 100644
--- a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -50,7 +50,7 @@
                <Configuration
                        Name="Debug|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -82,7 +82,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -114,7 +114,7 @@
                <Configuration
                        Name="Release|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
diff --git a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
index 6544701..e244d80 100644
--- a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
@@ -22,7 +22,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -52,7 +52,7 @@
                <Configuration
                        Name="Debug|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -85,7 +85,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
@@ -118,7 +118,7 @@
                <Configuration
                        Name="Release|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
diff --git a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops 
b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops
new file mode 100644
index 0000000..1f167bd
--- /dev/null
+++ b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gdk-pixbufversionpathsprops"
+       >
+       <UserMacro
+               Name="VSVer"
+               Value="9"
+       />
+       <UserMacro
+               Name="GlibEtcInstallRoot"
+               Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+       />
+       <UserMacro
+               Name="DefDir"
+               Value="$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+       />
+       <UserMacro
+               Name="CopyDir"
+               Value="$(GlibEtcInstallRoot)"
+       />
+       <UserMacro
+               Name="ApiVersion"
+               Value="2.0"
+       />
+       <UserMacro
+               Name="GdkPixbufLibtoolCompatibleDllPrefix"
+               Value="lib"
+       />
+       <UserMacro
+               Name="GdkPixbufLibtoolCompatibleDllSuffix"
+               Value="-$(ApiVersion)-0"
+       />
+       <UserMacro
+               Name="GdkPixbufSeparateVSDllPrefix"
+               Value=""
+       />
+       <UserMacro
+               Name="GdkPixbufSeparateVSDllSuffix"
+               Value="-2-vs$(VSVer)"
+       />
+       <!-- Change these two to GdkPixbufLibtoolCompatibleDllPrefix and
+       GdkPixbufLibtoolCompatibleDllSuffix if that is what you want -->
+       <UserMacro
+               Name="GdkPixbufDllPrefix"
+               Value="$(GdkPixbufSeparateVSDllPrefix)"
+       />
+       <UserMacro
+               Name="GdkPixbufDllSuffix"
+               Value="$(GdkPixbufSeparateVSDllSuffix)"
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/build/win32/vs9/gdk-pixbuf.vcprojin
index 4034aa3..be3098f 100644
--- a/build/win32/vs9/gdk-pixbuf.vcprojin
+++ b/build/win32/vs9/gdk-pixbuf.vcprojin
@@ -22,7 +22,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -33,7 +33,7 @@
                                AdditionalOptions=""
                                Optimization="0"
                                AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -59,7 +59,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -70,7 +70,7 @@
                                AdditionalOptions=""
                                Optimization="3"
                                AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -94,7 +94,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -105,7 +105,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -127,7 +127,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -136,7 +136,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -160,7 +160,7 @@
                        Name="Debug_NoGDIP|Win32"
                        OutputDirectory="Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -171,7 +171,7 @@
                                Optimization="0"
                                AdditionalOptions=""
                                AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -200,7 +200,7 @@
                        Name="Release_NoGDIP|Win32"
                        OutputDirectory="Release\$(PlatformName)\bin"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -211,7 +211,7 @@
                                AdditionalOptions=""
                                Optimization="3"
                                AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -237,7 +237,7 @@
                <Configuration
                        Name="Debug_NoGDIP|x64"
                        OutputDirectory="Debug\$(PlatformName)\bin"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -248,7 +248,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories=""
-                               
PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -272,7 +272,7 @@
                <Configuration
                        Name="Release_NoGDIP|x64"
                        OutputDirectory="Release\$(PlatformName)\bin"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -281,7 +281,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS);DLL_EXPORT"
+                               PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -433,12 +433,78 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
                        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_NoGDIP|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_NoGDIP|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_NoGDIP|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_NoGDIP|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols">
                                <FileConfiguration Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -446,7 +512,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -454,7 +520,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -462,7 +528,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -470,7 +536,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -478,7 +544,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -486,7 +552,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
@@ -494,7 +560,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gdk-pixbuf.def..."
-                                               CommandLine="$(GdkPixbufGenerateGdkPixbufDef)"
+                                               CommandLine="$(GenerateGdkPixbufDef)"
                                                Outputs="$(IntDir)\gdk-pixbuf.def"
                                        />
                                </FileConfiguration>
diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj
index ac6c036..854da31 100644
--- a/build/win32/vs9/gengir.vcproj
+++ b/build/win32/vs9/gengir.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -34,7 +34,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -47,7 +47,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -61,7 +61,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-gengir.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index ef7de3e..61c5937 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
@@ -36,7 +36,7 @@
                        Name="Release|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        WholeProgramOptimization="1"
@@ -48,7 +48,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
@@ -61,7 +61,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\gdk-pixbuf.vsprops"
+                       InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
                        CharacterSet="2"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]