MSVC 2008 Builds: Clean Up and Speed Up

Make the builds that use the open source imaging libraries the default
Debug and Release builds, and make the GDI+ builds have configs suffixed
with _GDI+, as the builds using the open source imaging libraries are in
a much better state, at least on more modern versions of Windows.

Also standardize on the linked libraries for all builds, regardless whether
a release or debug build is used, no more 'd' suffixes in the .lib
filenames, and move the .lib's to link into the property sheets, to ease
future maintenance.

Speed up release builds by using /MP for the compiler options, which can
cut down on release build times by quite a bit.  This does emit a brief
warning for debug builds, but the code would otherwise build normally.

3 files changed, 179 insertions, 187 deletions

diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
index 2dc9fac7e..32b6485ea 100644
--- a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
+++ b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
@@ -12,11 +12,13 @@
 		AdditionalIncludeDirectories="..\..\..;..\..\..\gdk-pixbuf;..\math-compat;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+		AdditionalOptions="/MP"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib libpng16.lib zlib1.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+		IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
 	/>
 	<UserMacro
 		Name="GdkPixbufBinaryVersion"
@@ -54,4 +56,12 @@
 		Name="GdkPixbufDefines"
 		Value="HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;GDK_PIXBUF_RELOCATABLE;$(GdkPixbufBinVerDefine);$(GdkPixbufPrefixDefine);$(MODULAR_MACROS)"
 	/>
+	<UserMacro
+		Name="GdipLibs"
+		Value="gdiplus.lib"
+	/>
+	<UserMacro
+		Name="ImagingLibs"
+		Value="jpeg.lib libjasper.lib libtiff_i.lib"
+	/>
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf.sln b/build/win32/vs9/gdk-pixbuf.sln
index dca59db50..0de897f6c 100644
--- a/build/win32/vs9/gdk-pixbuf.sln
+++ b/build/win32/vs9/gdk-pixbuf.sln
@@ -28,96 +28,96 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-pixdata", "gdk-p
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug_NoGDIP|Win32 = Debug_NoGDIP|Win32

-		Debug_NoGDIP|x64 = Debug_NoGDIP|x64

 		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

-		Release_NoGDIP|Win32 = Release_NoGDIP|Win32

-		Release_NoGDIP|x64 = Release_NoGDIP|x64

+		Debug_GDI+|Win32 = Debug_GDI+|Win32

+		Debug_GDI+|x64 = Debug_GDI+|x64

 		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

+		Release_GDI+|Win32 = Release_GDI+|Win32

+		Release_GDI+|x64 = Release_GDI+|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_NoGDIP|Win32.ActiveCfg = Debug_NoGDIP|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_NoGDIP|Win32.Build.0 = Debug_NoGDIP|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_NoGDIP|x64.ActiveCfg = Debug_NoGDIP|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_NoGDIP|x64.Build.0 = Debug_NoGDIP|x64

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.ActiveCfg = Debug|Win32

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.Build.0 = Debug|Win32

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.ActiveCfg = Debug|x64

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.Build.0 = Debug|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_NoGDIP|Win32.ActiveCfg = Release_NoGDIP|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_NoGDIP|Win32.Build.0 = Release_NoGDIP|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_NoGDIP|x64.ActiveCfg = Release_NoGDIP|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_NoGDIP|x64.Build.0 = Release_NoGDIP|x64

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.ActiveCfg = Debug_GDI+|Win32

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.Build.0 = Debug_GDI+|Win32

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.ActiveCfg = Debug_GDI+|x64

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.Build.0 = Debug_GDI+|x64

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.ActiveCfg = Release|Win32

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.Build.0 = Release|Win32

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.ActiveCfg = Release|x64

 		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.Build.0 = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_NoGDIP|Win32.ActiveCfg = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_NoGDIP|Win32.Build.0 = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_NoGDIP|x64.ActiveCfg = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_NoGDIP|x64.Build.0 = Debug|x64

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.ActiveCfg = Release_GDI+|Win32

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.Build.0 = Release_GDI+|Win32

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.ActiveCfg = Release_GDI+|x64

+		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.Build.0 = Release_GDI+|x64

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.Build.0 = Debug|Win32

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.ActiveCfg = Debug|x64

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.Build.0 = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_NoGDIP|Win32.ActiveCfg = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_NoGDIP|Win32.Build.0 = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_NoGDIP|x64.ActiveCfg = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_NoGDIP|x64.Build.0 = Release|x64

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.Build.0 = Debug|Win32

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.ActiveCfg = Debug|x64

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.Build.0 = Debug|x64

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.ActiveCfg = Release|Win32

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.Build.0 = Release|Win32

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.ActiveCfg = Release|x64

 		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.Build.0 = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_NoGDIP|Win32.ActiveCfg = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_NoGDIP|Win32.Build.0 = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_NoGDIP|x64.ActiveCfg = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_NoGDIP|x64.Build.0 = Debug|x64

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.ActiveCfg = Release|Win32

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.Build.0 = Release|Win32

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.ActiveCfg = Release|x64

+		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.Build.0 = Release|x64

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.Build.0 = Debug|Win32

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.ActiveCfg = Debug|x64

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.Build.0 = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_NoGDIP|Win32.ActiveCfg = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_NoGDIP|Win32.Build.0 = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_NoGDIP|x64.ActiveCfg = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_NoGDIP|x64.Build.0 = Release|x64

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.Build.0 = Debug|Win32

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.ActiveCfg = Debug|x64

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.Build.0 = Debug|x64

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.ActiveCfg = Release|Win32

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.Build.0 = Release|Win32

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.ActiveCfg = Release|x64

 		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.Build.0 = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_NoGDIP|Win32.ActiveCfg = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_NoGDIP|Win32.Build.0 = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_NoGDIP|x64.ActiveCfg = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_NoGDIP|x64.Build.0 = Debug|x64

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.ActiveCfg = Release|Win32

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.Build.0 = Release|Win32

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.ActiveCfg = Release|x64

+		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.Build.0 = Release|x64

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_NoGDIP|Win32.ActiveCfg = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_NoGDIP|Win32.Build.0 = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_NoGDIP|x64.ActiveCfg = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_NoGDIP|x64.Build.0 = Release|x64

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_GDI+|Win32.Build.0 = Debug|Win32

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_GDI+|x64.ActiveCfg = Debug|x64

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_GDI+|x64.Build.0 = Debug|x64

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64

 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_NoGDIP|Win32.ActiveCfg = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_NoGDIP|Win32.Build.0 = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_NoGDIP|x64.ActiveCfg = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_NoGDIP|x64.Build.0 = Debug|x64

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_GDI+|Win32.ActiveCfg = Release|Win32

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_GDI+|Win32.Build.0 = Release|Win32

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_GDI+|x64.ActiveCfg = Release|x64

+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_GDI+|x64.Build.0 = Release|x64

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.ActiveCfg = Debug|Win32

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.Build.0 = Debug|Win32

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.ActiveCfg = Debug|x64

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.Build.0 = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_NoGDIP|Win32.ActiveCfg = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_NoGDIP|Win32.Build.0 = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_NoGDIP|x64.ActiveCfg = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_NoGDIP|x64.Build.0 = Release|x64

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.Build.0 = Debug|Win32

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.ActiveCfg = Debug|x64

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.Build.0 = Debug|x64

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.ActiveCfg = Release|Win32

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.Build.0 = Release|Win32

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.ActiveCfg = Release|x64

 		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.Build.0 = Release|x64

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.ActiveCfg = Release|Win32

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.Build.0 = Release|Win32

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.ActiveCfg = Release|x64

+		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/build/win32/vs9/gdk-pixbuf.vcprojin
index eb0415fc4..b351cd0b7 100644
--- a/build/win32/vs9/gdk-pixbuf.vcprojin
+++ b/build/win32/vs9/gdk-pixbuf.vcprojin
@@ -20,9 +20,10 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
+			Name="Debug_GDI+|Win32"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
+			OutputDirectory="Debug\$(PlatformName)\bin"
 			CharacterSet="2"
 			>
 			<Tool
@@ -43,23 +44,23 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Gdiplus.lib libpng16d.lib zlib1d.lib"
-				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
+				AdditionalDependencies="$(GdipLibs)"
+				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/gdk-pixbuf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release_GDI+|Win32"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
+			OutputDirectory="Release\$(PlatformName)\bin"
 			CharacterSet="2"
 			>
 			<Tool
@@ -78,8 +79,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Gdiplus.lib libpng16.lib zlib1.lib"
-				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
+				AdditionalDependencies="$(GdipLibs)"
+				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
@@ -88,13 +89,14 @@
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Debug_GDI+|x64"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
+			OutputDirectory="Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -115,19 +117,20 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Gdiplus.lib libpng16d.lib zlib1d.lib"
+				AdditionalDependencies="$(GdipLibs)"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Release_GDI+|x64"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
+			OutputDirectory="Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -144,7 +147,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Gdiplus.lib libpng16.lib zlib1.lib"
+				AdditionalDependencies="$(GdipLibs)"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
@@ -152,12 +155,12 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_NoGDIP|Win32"
+			Name="Debug|Win32"
 			OutputDirectory="Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
@@ -182,22 +185,20 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng16d.lib zlib1d.lib intld.lib jpeg.lib libjasper.lib libtiffd_i.lib"
-				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
+				AdditionalDependencies="$(ImagingLibs)"
+				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/gdk-pixbuf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_NoGDIP|Win32"
+			Name="Release|Win32"
 			OutputDirectory="Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
@@ -219,10 +220,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng16.lib zlib1.lib intl.lib jpeg.lib libjasper.lib libtiff_i.lib"
-				OutputFile="$(OutDir)/$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
+				AdditionalDependencies="$(ImagingLibs)"
+				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -230,12 +230,12 @@
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_NoGDIP|x64"
+			Name="Debug|x64"
 			OutputDirectory="Debug\$(PlatformName)\bin"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
 			ConfigurationType="2"
@@ -258,19 +258,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng16d.lib zlib1d.lib intld.lib jpeg.lib libjasper.lib libtiffd_i.lib"
+				AdditionalDependencies="$(ImagingLibs)"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_NoGDIP|x64"
+			Name="Release|x64"
 			OutputDirectory="Release\$(PlatformName)\bin"
 			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
 			ConfigurationType="2"
@@ -289,16 +288,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng16.lib zlib1.lib intl.lib jpeg.lib libjasper.lib libtiff_i.lib"
+				AdditionalDependencies="$(ImagingLibs)"
 				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/gdk_pixbuf-$(ApiVersion).lib"
+				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -329,96 +327,96 @@
 			<File RelativePath="..\..\..\gdk-pixbuf\pixops\pixops.c" />
 			<Filter	Name="Native" >
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-animation.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-bmp.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-emf.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-gif.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-ico.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-jpeg.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-tiff.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-utils.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-wmf.c" >
-					<FileConfiguration Name="Release_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_NoGDIP|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 			</Filter>
 			<Filter Name="Non-Native" >
 				<File RelativePath="..\..\..\gdk-pixbuf\io-bmp.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-gif.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-ico.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-jasper.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-jpeg.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 				<File RelativePath="..\..\..\gdk-pixbuf\io-tiff.c" >
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
@@ -434,65 +432,57 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File RelativePath="..\..\..\config.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Debug_GDI+|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"
+				<FileConfiguration Name="Debug|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"
+				<FileConfiguration Name="Release_GDI+|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"
+				<FileConfiguration Name="Release|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"
+				<FileConfiguration Name="Debug_GDI+|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"
+				<FileConfiguration Name="Debug|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"
+				<FileConfiguration Name="Release_GDI+|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"
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
 						Description="Copying config.h from config.h.win32..."
 						CommandLine="$(GenConfigH)"
 						Outputs="..\..\..\config.h"
@@ -500,65 +490,57 @@
 				</FileConfiguration>
 			</File>
 			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Debug_GDI+|Win32">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Debug_NoGDIP|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Release_GDI+|Win32">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Release_NoGDIP|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Debug_GDI+|x64">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Debug_NoGDIP|x64">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Release_GDI+|x64">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"
 					/>
 				</FileConfiguration>
-				<FileConfiguration Name="Release_NoGDIP|x64">
-					<Tool
-						Name="VCCustomBuildTool"
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
 						Description="Generating gdk-pixbuf.def..."
 						CommandLine="$(GenerateGdkPixbufDef)"
 						Outputs="$(IntDir)\gdk-pixbuf.def"