[gdk-pixbuf] Visual Studio builds: Move projects to win32/

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gdk-pixbuf] Visual Studio builds: Move projects to win32/
Date: Fri, 20 Jan 2017 07:29:53 +0000 (UTC)

commit 28cb76977068d33d8f5b02d3fffb25cfe79338e4
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jan 20 15:19:18 2017 +0800

    Visual Studio builds: Move projects to win32/
    
    This moves the Visual Studio project files and related items under win32/
    so that people can go one less directory layer down to the Visual Studio
    projects.  This also makes things in sync with what is now on GLib and GTK+,
    and cleans up the Visual Studio 201x projects as some items can actually be
    combined.

 Makefile.am                                        |    2 +-
 build/Makefile-newvs.am                            |   45 -----
 build/Makefile.am                                  |    3 -
 build/Makefile.msvcproj                            |  114 ------------
 build/win32/vs10/gdk-pixbuf.vcxproj.filtersin      |   49 -----
 configure.ac                                       |   17 +-
 gdk-pixbuf/Makefile.am                             |   16 +-
 win32/Makefile-newvs.am                            |   46 +++++
 {build/win32 => win32}/Makefile.am                 |    2 +-
 {build => win32}/Makefile.msvc-introspection       |   64 ++++----
 win32/Makefile.msvcproj                            |  153 ++++++++++++++++
 {build/win32 => win32}/detectenv-msvc.mak          |    0
 .../gdk-pixbuf-introspection-msvc.mak              |    0
 {build/win32 => win32}/gdkpixbuf-pc.py             |    0
 {build/win32 => win32}/introspection-msvc.mak      |    0
 {build/win32 => win32}/pc_base.py                  |    0
 {build/win32 => win32}/replace.py                  |    0
 {build/win32 => win32}/vs10/Makefile.am            |   12 +-
 {build/win32 => win32}/vs10/README.txt             |    4 +-
 .../vs10/gdk-pixbuf-build-defines.props            |    2 +-
 .../vs10/gdk-pixbuf-csource.vcxproj                |    4 +-
 .../vs10/gdk-pixbuf-csource.vcxproj.filters        |    4 +-
 .../win32 => win32}/vs10/gdk-pixbuf-gen-srcs.props |    2 +-
 .../vs10/gdk-pixbuf-install.propsin                |    0
 .../vs10/gdk-pixbuf-install.vcxproj                |   40 ++---
 .../vs10/gdk-pixbuf-install.vcxproj.filters        |    4 +-
 .../vs10/gdk-pixbuf-pixdata.vcxproj                |    2 +-
 .../vs10/gdk-pixbuf-pixdata.vcxproj.filters        |    4 +-
 .../vs10/gdk-pixbuf-query-loaders.vcxproj          |    4 +-
 .../vs10/gdk-pixbuf-query-loaders.vcxproj.filters  |    4 +-
 .../vs10/gdk-pixbuf-version-paths.props.in         |    4 +-
 {build/win32 => win32}/vs10/gdk-pixbuf.sln         |    0
 win32/vs10/gdk-pixbuf.vcxproj.filtersin            |   49 +++++
 {build/win32 => win32}/vs10/gdk-pixbuf.vcxprojin   |  188 +++++++------------
 {build/win32 => win32}/vs11/Makefile.am            |    6 +-
 {build/win32 => win32}/vs12/Makefile.am            |    4 +-
 {build/win32 => win32}/vs14/Makefile.am            |    4 +-
 {build/win32 => win32}/vs9/Makefile.am             |    4 +-
 {build/win32 => win32}/vs9/README.txt              |    4 +-
 .../vs9/gdk-pixbuf-build-defines.vsprops           |    2 +-
 .../win32 => win32}/vs9/gdk-pixbuf-csource.vcproj  |    2 +-
 .../vs9/gdk-pixbuf-gen-srcs.vsprops                |    2 +-
 .../win32 => win32}/vs9/gdk-pixbuf-install.vcproj  |    2 +-
 .../vs9/gdk-pixbuf-install.vspropsin               |    0
 .../win32 => win32}/vs9/gdk-pixbuf-pixdata.vcproj  |    2 +-
 .../vs9/gdk-pixbuf-query-loaders.vcproj            |    2 +-
 .../vs9/gdk-pixbuf-version-paths.vsprops.in        |    2 +-
 {build/win32 => win32}/vs9/gdk-pixbuf.sln          |    0
 {build/win32 => win32}/vs9/gdk-pixbuf.vcprojin     |   54 +++---
 {build/win32 => win32}/vs9/math.h                  |    0
 50 files changed, 454 insertions(+), 474 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ab16470..8e1e31d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib build
+SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32
 
 EXTRA_DIST =                   \
        config.h.win32          \
diff --git a/configure.ac b/configure.ac
index 99e9951..5ef39a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,15 +1106,14 @@ gdk-pixbuf/Makefile
 gdk-pixbuf/gdk_pixbuf.rc
 gdk-pixbuf/gdk-pixbuf-features.h
 gdk-pixbuf/pixops/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/gdk-pixbuf-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gdk-pixbuf-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/gdk-pixbuf-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/gdk-pixbuf-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk-pixbuf/Makefile
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index e492db8..a318985 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -618,7 +618,7 @@ gdk_pixbuf_HEADERS_DIR = $(libgdk_pixbufincludedir)
 gdk_pixbuf_HEADERS_INST = $(libgdk_pixbufinclude_HEADERS)
 gdk_pixbuf_HEADERS_EXCLUDES = gdkpdummy
 
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 
@@ -651,8 +651,8 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 MSVC_INTROSPECT_GIRS = GdkPixbuf-2.0.gir
 
 MSVC_INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/build/win32/GdkPixbuf-2.0.gir.msvc.introspect   \
-       $(top_builddir)/build/win32/GdkPixbuf_2_0_gir_list
+       $(top_builddir)/win32/GdkPixbuf-2.0.gir.msvc.introspect \
+       $(top_builddir)/win32/GdkPixbuf_2_0_gir_list
 
 GdkPixbuf_2_0_gir_MSVC_INCLUDE_GIRS = $(GdkPixbuf_2_0_gir_INCLUDES)
 GdkPixbuf_2_0_gir_MSVC_EXPORT_PACKAGES = $(GdkPixbuf_2_0_gir_EXPORT_PACKAGES)
@@ -661,19 +661,19 @@ GdkPixbuf_2_0_gir_MSVC_FILES = $(GdkPixbuf_2_0_gir_FILES)
 
 GdkPixbuf_2_0_gir_MSVC_CFLAGS =                \
        -DGDK_PIXBUF_COMPILATION        \
-       -I../..                         \
-       -I../../gdk-pixbuf
+       -I..                            \
+       -I../gdk-pixbuf
 
 GdkPixbuf_2_0_gir_MSVC_SCANNERFLAGS = $(GdkPixbuf_2_0_gir_SCANNERFLAGS)
 
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
 else
 MSVC_INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook:     \
-       $(top_builddir)/build/win32/vs9/gdk-pixbuf.vcproj       \
-       $(top_builddir)/build/win32/vs9/gdk-pixbuf.headers      \
+       $(top_builddir)/win32/vs9/gdk-pixbuf.vcproj     \
+       $(top_builddir)/win32/vs9/gdk-pixbuf.headers    \
        $(MSVC_INTROSPECTION_INTERMEDIATE_ITEMS)
 
 if CROSS_COMPILING
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..ecdf3b5
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,46 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013/2015 project files
+# from the Visual Studio 2010 project files
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 
for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+       sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+       sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.txt:
+       sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+       sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.vcxproj:
+       if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+               sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       else \
+               sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       fi
+
+%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
+       if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+               sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       else \
+               sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       fi
+
+%.vcxproj.filters:
+       if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+               cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       else \
+               cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+       fi
diff --git a/build/win32/Makefile.am b/win32/Makefile.am
similarity index 92%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
index bcc18f2..6559879 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -7,7 +7,7 @@ introspection.body.mak: GdkPixbuf-2.0.gir.msvc.introspect
        -$(RM) introspection.body.mak
        for F in `ls *.msvc.introspect`; do \
                case $$F in \
-                       *)      cat $(top_builddir)/build/win32/$$F >>$@ \
+                       *)      cat $(top_builddir)/win32/$$F >>$@ \
                        ;; \
                esac; \
        done
diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
similarity index 66%
rename from build/Makefile.msvc-introspection
rename to win32/Makefile.msvc-introspection
index 6c90964..370bcb9 100644
--- a/build/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -2,7 +2,7 @@
 # Common autotools file for constructing the g-ir-scanner and
 # g-ir-compiler command lines for Visual Studio builds.
 
-# This is copied from $(srcroot)/build from the gobject-introspection
+# This is copied from the gobject-introspection
 # project, which may be included in projects that support both
 # Visual Studio builds and introspection.
 
@@ -18,7 +18,7 @@
 #    is required unless --headers-only is specified in
 #    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
 #
-#   include $(top_srcdir)/build/Makefile.msvc-introspection
+#   include $(top_srcdir)/Makefile.msvc-introspection
 #   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
 #   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
 #   YourLib_1_0_gir_VERSION = 1.0 # This is optional
@@ -79,47 +79,47 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
           $($(_gir_name)_MSVC_PROGRAM)),,
     $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
 
-$(top_builddir)/build/win32/$(_gir_name)_list:
+$(top_builddir)/win32/$(_gir_name)_list:
        for F in $(_gir_files_msvc); do \
                case $$$$F in \
                *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-                       echo '..\..'$(_gir_source_subdir_msvc)$$$$F

$(top_builddir)/build/win32/$(_gir_name)_list \

+                       echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
                        ;; \
                esac; \
        done
 
-$(top_builddir)/build/win32/$(1).msvc.introspect:
-       -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
+$(top_builddir)/win32/$(1).msvc.introspect:
+       -$(RM) $(top_builddir)/win32/$(1).msvc.introspect
 
 # Assemble the Command to Run g-ir-scanner
-       echo $(1)': '$(_gir_name)'_list 
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --verbose -no-libtool   \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --namespace='$(_gir_namespace_msvc)'    \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --nsversion='$(_gir_version_msvc)'      \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(_gir_libraries_msvc)'        \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(_gir_program_msvc)'  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --add-include-path=$$$$(G_IR_INCLUDEDIR)        
\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(_gir_export_packages_msvc)'  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --cflags-begin  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$($(_gir_name)_MSVC_CFLAGS)'   \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --cflags-end    \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$($(_gir_name)_MSVC_SCANNERFLAGS)'     \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --filelist='$(_gir_name)'_list  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+       echo $(1)': '$(_gir_name)'_list 
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --verbose -no-libtool   \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --namespace='$(_gir_namespace_msvc)'    \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --nsversion='$(_gir_version_msvc)'      \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(_gir_libraries_msvc)'        \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(_gir_program_msvc)'  \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --add-include-path=$$$$(G_IR_INCLUDEDIR)        \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(_gir_export_packages_msvc)'  \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --cflags-begin  \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$($(_gir_name)_MSVC_CFLAGS)'   \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --cflags-end    \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$($(_gir_name)_MSVC_SCANNERFLAGS)'     \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --filelist='$(_gir_name)'_list  \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
 
 # Finally Assemble the Command to Compile the generated .gir
-       echo '$(_typelib_basename_msvc).typelib: 
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  $$$$(G_IR_COMPILER)     \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  --includedir=. --debug --verbose        \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  '$(1)'  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '  -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-       echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+       echo '$(_typelib_basename_msvc).typelib: 
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  $$$$(G_IR_COMPILER)     \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  --includedir=. --debug --verbose        \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  '$(1)'  \'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '  -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+       echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
 endef
 
 $(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
new file mode 100644
index 0000000..2e96e12
--- /dev/null
+++ b/win32/Makefile.msvcproj
@@ -0,0 +1,153 @@
+# Author: Fan, Chun-wei
+# Common Autotools file used to generate Visual Studio 2008+
+# Projects from their templates
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# * Input variables:
+#
+#   MSVCPROJS - List of Projects that should be generated
+#
+# * Simple tutorial
+#
+# Add this to Makefile.am where your library/program is built:
+#   include <this Makefile.msvcproj>
+#   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
+#   YourProject_FILES = $(libyourlib_1_0_SOURCES)
+#   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random 
unsed value if none
+#   (the following 3 lines if headers need to be installed)
+#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
+#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
+#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', 
wildcards allowed; use random unsed value if none>
+#
+#   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in 
the process)
+#      $(top_builddir)/win32/vs9/YourProject.vcproj    \
+#      $(top_builddir)/win32/vs9/YourProject.headers   # if headers need to be installed
+#
+#   --or, if Visual Studio 2013 or later is required--
+#   dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
+#      $(top_builddir)/win32/vs12/YourProject.vcxproj  \
+#      $(top_builddir)/win32/vs12/YourProject.vs12.headers     # if headers need to be installed
+
+# Private functions
+
+## Transform the MSVC project filename (no filename extensions) to something which can reference through a 
variable
+## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
+_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
+_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
+_proj_path=$(subst /,\\,$(_proj_path_raw))
+_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
+_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
+
+_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
+_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst 
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
+_proj_filters=$($(_proj_name)_EXCLUDES)
+
+_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
+_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst 
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
+_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
+
+_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
+_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
+
+#
+# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
+# $(1) - Base Name of the MSVC project files (outputs)
+#
+
+define msvcproj-builder
+
+$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
+$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+
+$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
+       -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
+       -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
+       -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
+       -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
+       -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
+       -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
+       -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
+       -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+       -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+
+       for F in $(_proj_files); do \
+               case $$$$F in \
+               $(_proj_filters)) \
+                       ;; \
+               *.c|*.cpp|*.cc|*.cxx) \
+                       echo '   <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+                       echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles 
&& \
+                       echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source 
Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+                       ;; \
+               esac;   \
+       done
+
+
+       $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
+       $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
+       $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin

$(top_builddir)/win32/vs10/$(1).vcxproj.filters

+       $(RM) $(1).sourcefiles
+       $(RM) $(1).vs10.sourcefiles
+       $(RM) $(1).vs10.sourcefiles.filters
+
+$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
+
+$(top_builddir)/win32/vs9/$(1).headers: Makefile
+       -$(RM) $(top_builddir)/win32/vs9/$(1).headers
+       -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
+
+       for F in $(_proj_headers); do \
+               case $$$$F in \
+               $(_proj_headers_excludes)) \
+                       ;; \
+               *.h|*.hpp|*.hh|*.hxx) \
+                       echo 'copy ..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
+                       echo 'copy ..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
+                       ;; \
+               esac;   \
+       done
+
+$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
+
+$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
+       -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+       -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+       for F in $(_proj_files); do \
+               case $$$$F in \
+               $(_proj_filters)) \
+                       ;; \
+               *.c|*.cpp|*.cc|*.cxx) \
+                       echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles 
&& \
+                       echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source 
Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
+                       ;; \
+               esac;   \
+       done
+
+       $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
+       $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin

$(top_builddir)/win32/vs12/$(1).vcxproj.filters

+       $(RM) $(1).vs12.sourcefiles
+       $(RM) $(1).vs12.sourcefiles.filters
+
+$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
+       -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
+
+       for F in $(_proj_headers); do \
+               case $$$$F in \
+               $(_proj_headers_excludes)) \
+                       ;; \
+               *.h|*.hpp|*.hh|*.hxx) \
+                       echo 'copy ..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
+                       ;; \
+               esac;   \
+       done
+
+endef
+
+$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
similarity index 100%
rename from build/win32/detectenv-msvc.mak
rename to win32/detectenv-msvc.mak
diff --git a/build/win32/gdk-pixbuf-introspection-msvc.mak b/win32/gdk-pixbuf-introspection-msvc.mak
similarity index 100%
rename from build/win32/gdk-pixbuf-introspection-msvc.mak
rename to win32/gdk-pixbuf-introspection-msvc.mak
diff --git a/build/win32/gdkpixbuf-pc.py b/win32/gdkpixbuf-pc.py
similarity index 100%
rename from build/win32/gdkpixbuf-pc.py
rename to win32/gdkpixbuf-pc.py
diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
similarity index 100%
rename from build/win32/introspection-msvc.mak
rename to win32/introspection-msvc.mak
diff --git a/build/win32/pc_base.py b/win32/pc_base.py
similarity index 100%
rename from build/win32/pc_base.py
rename to win32/pc_base.py
diff --git a/build/win32/replace.py b/win32/replace.py
similarity index 100%
rename from build/win32/replace.py
rename to win32/replace.py
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 63%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 62e8433..ed36818 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -23,14 +23,14 @@ EXTRA_DIST = \
        $(GENERATED_ITEMS)              \
        math.h
 
-gdk-pixbuf-install.props: $(top_srcdir)/build/win32/vs10/gdk-pixbuf-install.propsin gdk-pixbuf.vs10.headers
-       -$(RM) $(top_builddir)/build/win32/vs11/gdk-pixbuf-install.props
-       -$(RM) $(top_builddir)/build/win32/vs12/gdk-pixbuf-install.props
-       -$(RM) $(top_builddir)/build/win32/vs14/gdk-pixbuf-install.props
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk-pixbuf-install.propsin >$@
+gdk-pixbuf-install.props: $(top_srcdir)/win32/vs10/gdk-pixbuf-install.propsin gdk-pixbuf.vs10.headers
+       -$(RM) $(top_builddir)/win32/vs11/gdk-pixbuf-install.props
+       -$(RM) $(top_builddir)/win32/vs12/gdk-pixbuf-install.props
+       -$(RM) $(top_builddir)/win32/vs14/gdk-pixbuf-install.props
+       $(CPP) -P - <$(top_srcdir)/win32/vs10/gdk-pixbuf-install.propsin >$@
        rm gdk-pixbuf.vs10.headers
 
-math.h: $(top_srcdir)/build/win32/vs9/math.h
+math.h: $(top_srcdir)/win32/vs9/math.h
        cp $< $@
 
 DISTCLEANFILES = $(GENERATED_ITEMS) math.h
diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt
similarity index 95%
rename from build/win32/vs10/README.txt
rename to win32/vs10/README.txt
index 3d096f8..677c723 100644
--- a/build/win32/vs10/README.txt
+++ b/win32/vs10/README.txt
@@ -87,7 +87,7 @@ folder <root>:
 <root>\vs10\<PlatformName>
 
 *this* file you are now reading is thus located at
-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\build\win32\vs10\README.
+<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\win32\vs10\README.
 
 <PlatformName> is either Win32 or x64, as in the VS10 project files.
 
@@ -108,7 +108,7 @@ If you build any of the dependencies yourselves, copy the:
 If you have not built GLib with VS10 and placed the LIBs and headers in a
 place where VS10 can find them automatically, you should also uncompress
 your GLib sources in <root>\ and build it from there, following the
-instructions in <root>\glib<-version>\build\win32\vs10, so that the required
+instructions in <root>\glib<-version>\win32\vs10, so that the required
 headers, EXEs, DLLs and LIBs will end up in
 <root>\vs10\<PlatformName>\include\glib-2.0 (headers)
 <root>\vs10\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)
diff --git a/build/win32/vs10/gdk-pixbuf-build-defines.props b/win32/vs10/gdk-pixbuf-build-defines.props
similarity index 92%
rename from build/win32/vs10/gdk-pixbuf-build-defines.props
rename to win32/vs10/gdk-pixbuf-build-defines.props
index 80032c1..2aad4a1 100644
--- a/build/win32/vs10/gdk-pixbuf-build-defines.props
+++ b/win32/vs10/gdk-pixbuf-build-defines.props
@@ -23,7 +23,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      
<AdditionalIncludeDirectories>..\..\..;..\..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..;..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/gdk-pixbuf-csource.vcxproj b/win32/vs10/gdk-pixbuf-csource.vcxproj
similarity index 99%
rename from build/win32/vs10/gdk-pixbuf-csource.vcxproj
rename to win32/vs10/gdk-pixbuf-csource.vcxproj
index 6d03735..374164f 100644
--- a/build/win32/vs10/gdk-pixbuf-csource.vcxproj
+++ b/win32/vs10/gdk-pixbuf-csource.vcxproj
@@ -165,7 +165,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
+    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-pixbuf.vcxproj">
@@ -176,4 +176,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-csource.vcxproj.filters 
b/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
similarity index 85%
rename from build/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
rename to win32/vs10/gdk-pixbuf-csource.vcxproj.filters
index 4ff6d58..51d1103 100644
--- a/build/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
+++ b/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
@@ -7,8 +7,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c">
+    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-csource.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-gen-srcs.props b/win32/vs10/gdk-pixbuf-gen-srcs.props
similarity index 88%
rename from build/win32/vs10/gdk-pixbuf-gen-srcs.props
rename to win32/vs10/gdk-pixbuf-gen-srcs.props
index 3e53113..167a673 100644
--- a/build/win32/vs10/gdk-pixbuf-gen-srcs.props
+++ b/win32/vs10/gdk-pixbuf-gen-srcs.props
@@ -4,7 +4,7 @@
     <Import Project="gdk-pixbuf-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
+    <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gdk-pixbufgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/gdk-pixbuf-install.propsin b/win32/vs10/gdk-pixbuf-install.propsin
similarity index 100%
rename from build/win32/vs10/gdk-pixbuf-install.propsin
rename to win32/vs10/gdk-pixbuf-install.propsin
diff --git a/build/win32/vs10/gdk-pixbuf-install.vcxproj b/win32/vs10/gdk-pixbuf-install.vcxproj
similarity index 71%
rename from build/win32/vs10/gdk-pixbuf-install.vcxproj
rename to win32/vs10/gdk-pixbuf-install.vcxproj
index 5188914..cd651e1 100644
--- a/build/win32/vs10/gdk-pixbuf-install.vcxproj
+++ b/win32/vs10/gdk-pixbuf-install.vcxproj
@@ -67,14 +67,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
+    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </ItemDefinitionGroup>
@@ -85,25 +81,17 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\config.h.win32">
+      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GdkPixbufPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)'=='Debug'">$(GdkPixbufDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GdkPixbufPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)'=='Release'">$(GdkPixbufDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\gdk-pixbuf-2.0.pc.in">
+    <CustomBuild Include="..\..\gdk-pixbuf-2.0.pc.in">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGdkPixbufPC)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
diff --git a/build/win32/vs10/gdk-pixbuf-install.vcxproj.filters 
b/win32/vs10/gdk-pixbuf-install.vcxproj.filters
similarity index 67%
rename from build/win32/vs10/gdk-pixbuf-install.vcxproj.filters
rename to win32/vs10/gdk-pixbuf-install.vcxproj.filters
index 8fd9d6a..bcde1a7 100644
--- a/build/win32/vs10/gdk-pixbuf-install.vcxproj.filters
+++ b/win32/vs10/gdk-pixbuf-install.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk-pixbuf-2.0.pc.in"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\gdk-pixbuf-2.0.pc.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj b/win32/vs10/gdk-pixbuf-pixdata.vcxproj
similarity index 99%
rename from build/win32/vs10/gdk-pixbuf-pixdata.vcxproj
rename to win32/vs10/gdk-pixbuf-pixdata.vcxproj
index c5b3787..79675d3 100644
--- a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj
+++ b/win32/vs10/gdk-pixbuf-pixdata.vcxproj
@@ -158,7 +158,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
+    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-pixbuf.vcxproj">
diff --git a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters 
b/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
similarity index 82%
rename from build/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
rename to win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
index 481e92d..21d9ee6 100644
--- a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
+++ b/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
@@ -7,8 +7,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c">
+    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c">
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
similarity index 99%
rename from build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
rename to win32/vs10/gdk-pixbuf-query-loaders.vcxproj
index 9d27e4c..5ebc5e2 100644
--- a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
+++ b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
@@ -162,7 +162,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\queryloaders.c" />
+    <ClCompile Include="..\..\gdk-pixbuf\queryloaders.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-pixbuf.vcxproj">
@@ -173,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters 
b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
similarity index 86%
rename from build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
rename to win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
index 4a4f433..39f085d 100644
--- a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
+++ b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
@@ -7,8 +7,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk-pixbuf\queryloaders.c">
+    <ClCompile Include="..\..\gdk-pixbuf\queryloaders.c">
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf-version-paths.props.in b/win32/vs10/gdk-pixbuf-version-paths.props.in
similarity index 96%
rename from build/win32/vs10/gdk-pixbuf-version-paths.props.in
rename to win32/vs10/gdk-pixbuf-version-paths.props.in
index 59200f6..8ed4baf 100644
--- a/build/win32/vs10/gdk-pixbuf-version-paths.props.in
+++ b/win32/vs10/gdk-pixbuf-version-paths.props.in
@@ -6,7 +6,7 @@
     <GdkPixbufMinorVersion>@GDK_PIXBUF_MINOR@</GdkPixbufMinorVersion>
     <GdkPixbufMicroVersion>@GDK_PIXBUF_MICRO@</GdkPixbufMicroVersion>
     <ApiVersion>2.0</ApiVersion>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
@@ -71,4 +71,4 @@
       <Value>$(PythonPathX64)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf.sln b/win32/vs10/gdk-pixbuf.sln
similarity index 100%
rename from build/win32/vs10/gdk-pixbuf.sln
rename to win32/vs10/gdk-pixbuf.sln
diff --git a/win32/vs10/gdk-pixbuf.vcxproj.filtersin b/win32/vs10/gdk-pixbuf.vcxproj.filtersin
new file mode 100644
index 0000000..a2feeef
--- /dev/null
+++ b/win32/vs10/gdk-pixbuf.vcxproj.filtersin
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\GDI+">
+      <UniqueIdentifier>{c4d26c4e-e8c9-48fa-b402-0ab65b5eee2f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Opensource_Imaging">
+      <UniqueIdentifier>{744a1b93-b9d4-44cc-a3c0-15944c405223}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "gdk-pixbuf.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\gdk-pixbuf\pixops\pixops.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-animation.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-bmp.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-emf.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-gif.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-ico.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-jpeg.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-tiff.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-utils.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-wmf.c"><Filter>Source Files\GDI+</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-bmp.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gif.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gif-animation.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-ico.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-jasper.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-jpeg.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+    <ClCompile Include="..\..\gdk-pixbuf\io-tiff.c"><Filter>Source 
Files\Opensource_Imaging</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\gdk-pixbuf\gdk_pixbuf.rc"><Filter>Resource 
Files</Filter></ResourceCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/win32/vs10/gdk-pixbuf.vcxprojin
similarity index 59%
rename from build/win32/vs10/gdk-pixbuf.vcxprojin
rename to win32/vs10/gdk-pixbuf.vcxprojin
index 87ac6e4..73e5012 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/win32/vs10/gdk-pixbuf.vcxprojin
@@ -117,18 +117,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">Debug\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">Release\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">Debug\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">Release\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)'=='Debug_GDI'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)'=='Debug_GDI'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)'=='Release_GDI'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)'=='Release_GDI'">Release\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">
     <ClCompile>
@@ -328,134 +322,90 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 #include "gdk-pixbuf.vs10.sourcefiles"
-    <ClCompile Include="..\..\..\gdk-pixbuf\pixops\pixops.c" />
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-animation.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\pixops\pixops.c" />
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-animation.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-bmp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-bmp.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-emf.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-emf.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-gif.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-gif.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-ico.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-ico.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-jpeg.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-jpeg.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-tiff.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-tiff.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-utils.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-utils.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gdip-wmf.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-wmf.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-bmp.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-bmp.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gif.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gif.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-gif-animation.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-gif-animation.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-ico.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-ico.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-jasper.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-jasper.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-jpeg.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-jpeg.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk-pixbuf\io-tiff.c">
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="..\..\gdk-pixbuf\io-tiff.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenConfigH)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\config.h.win32">
+      <Message Condition="'$(Configuration)'=='Debug_GDI'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)'=='Debug_GDI'">$(GenConfigH)</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug_GDI'">..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release_GDI'">Copying config.h from 
config.h.win32...</Message>
+      <Command Condition="'$(Configuration)'=='Release_GDI'">$(GenConfigH)</Command>
+      <Outputs Condition="'$(Configuration)'=='Release_GDI'">..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\..\gdk-pixbuf\gdk_pixbuf.rc" />
+    <ResourceCompile Include="..\..\gdk-pixbuf\gdk_pixbuf.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 83%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index 7c9d719..a3b57f6 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -19,13 +19,15 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
 MSVC_VER = 11
 MSVC_VER_LONG = 2012
 MSVC_FORMAT_VER = 12
 
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
 
-math.h: $(top_srcdir)/build/win32/vs9/math.h
+math.h: $(top_srcdir)/win32/vs9/math.h
        cp $< $@
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 88%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index 847a210..5ac1f4b 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -18,10 +18,12 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
 MSVC_VER = 12
 MSVC_VER_LONG = 2013
 MSVC_FORMAT_VER = 12
 
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
similarity index 87%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index 41ca458..0c2b901 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -18,10 +18,12 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
 MSVC_VER = 14
 MSVC_VER_LONG = 14
 MSVC_FORMAT_VER = 12
 
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 73%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 8711337..9e42042 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -17,8 +17,8 @@ EXTRA_DIST =  \
        $(GENERATED_ITEMS)              \
        math.h
 
-gdk-pixbuf-install.vsprops: $(top_srcdir)/build/win32/vs9/gdk-pixbuf-install.vspropsin gdk-pixbuf.headers
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk-pixbuf-install.vspropsin >$@
+gdk-pixbuf-install.vsprops: $(top_srcdir)/win32/vs9/gdk-pixbuf-install.vspropsin gdk-pixbuf.headers
+       $(CPP) -P - <$(top_srcdir)/win32/vs9/gdk-pixbuf-install.vspropsin >$@
        rm gdk-pixbuf.headers
 
 DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt
similarity index 95%
rename from build/win32/vs9/README.txt
rename to win32/vs9/README.txt
index 51214aa..099d4e2 100644
--- a/build/win32/vs9/README.txt
+++ b/win32/vs9/README.txt
@@ -87,7 +87,7 @@ folder <root>:
 <root>\vs9\<PlatformName>
 
 *this* file you are now reading is thus located at
-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\build\win32\vs9\README.
+<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\win32\vs9\README.
 
 <PlatformName> is either Win32 or x64, as in VS9 project files.
 
@@ -108,7 +108,7 @@ If you build any of the dependencies yourselves, copy the:
 If you have not built GLib with VS9 and placed the LIBs and headers in a
 place where VS9 can find them automatically, you should also uncompress
 your GLib sources in <root>\ and build it from there, following the
-instructions in <root>\glib<-version>\build\win32\vs9, so that the required
+instructions in <root>\glib<-version>\win32\vs9, so that the required
 headers, EXEs, DLLs and LIBs will end up in
 <root>\vs9\<PlatformName>\include\glib-2.0 (headers)
 <root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)
diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops b/win32/vs9/gdk-pixbuf-build-defines.vsprops
similarity index 90%
rename from build/win32/vs9/gdk-pixbuf-build-defines.vsprops
rename to win32/vs9/gdk-pixbuf-build-defines.vsprops
index eacc25c..d69c575 100644
--- a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops
+++ b/win32/vs9/gdk-pixbuf-build-defines.vsprops
@@ -9,7 +9,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               
AdditionalIncludeDirectories="..\..\..;..\..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
+               
AdditionalIncludeDirectories="..\..;..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(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"
diff --git a/build/win32/vs9/gdk-pixbuf-csource.vcproj b/win32/vs9/gdk-pixbuf-csource.vcproj
similarity index 98%
rename from build/win32/vs9/gdk-pixbuf-csource.vcproj
rename to win32/vs9/gdk-pixbuf-csource.vcproj
index 8fb5c99..be78fa9 100644
--- a/build/win32/vs9/gdk-pixbuf-csource.vcproj
+++ b/win32/vs9/gdk-pixbuf-csource.vcproj
@@ -158,7 +158,7 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
+                       <File RelativePath="..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
                </Filter>
        </Files>
        <Globals>
diff --git a/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops b/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
similarity index 82%
rename from build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
rename to win32/vs9/gdk-pixbuf-gen-srcs.vsprops
index 54c4f59..b92819e 100644
--- a/build/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
+++ b/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
@@ -7,6 +7,6 @@
        >
        <UserMacro
                Name="GenConfigH"
-               Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+               Value="copy ..\..\config.h.win32 ..\..\config.h"
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gdk-pixbuf-install.vcproj b/win32/vs9/gdk-pixbuf-install.vcproj
similarity index 98%
rename from build/win32/vs9/gdk-pixbuf-install.vcproj
rename to win32/vs9/gdk-pixbuf-install.vcproj
index b4c722f..d023725 100644
--- a/build/win32/vs9/gdk-pixbuf-install.vcproj
+++ b/win32/vs9/gdk-pixbuf-install.vcproj
@@ -82,7 +82,7 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
-                       <File RelativePath="..\..\..\gdk-pixbuf-2.0.pc.in">
+                       <File RelativePath="..\..\gdk-pixbuf-2.0.pc.in">
                                <FileConfiguration Name="Debug|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating .pc files..."
diff --git a/build/win32/vs9/gdk-pixbuf-install.vspropsin b/win32/vs9/gdk-pixbuf-install.vspropsin
similarity index 100%
rename from build/win32/vs9/gdk-pixbuf-install.vspropsin
rename to win32/vs9/gdk-pixbuf-install.vspropsin
diff --git a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj b/win32/vs9/gdk-pixbuf-pixdata.vcproj
similarity index 98%
rename from build/win32/vs9/gdk-pixbuf-pixdata.vcproj
rename to win32/vs9/gdk-pixbuf-pixdata.vcproj
index 6c07e98..de88421 100644
--- a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj
+++ b/win32/vs9/gdk-pixbuf-pixdata.vcproj
@@ -153,7 +153,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
+                       <File RelativePath="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
                </Filter>
        </Files>
        <Globals>
diff --git a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj b/win32/vs9/gdk-pixbuf-query-loaders.vcproj
similarity index 98%
rename from build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
rename to win32/vs9/gdk-pixbuf-query-loaders.vcproj
index e244d80..a6eda73 100644
--- a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
+++ b/win32/vs9/gdk-pixbuf-query-loaders.vcproj
@@ -157,7 +157,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\gdk-pixbuf\queryloaders.c" />
+                       <File RelativePath="..\..\gdk-pixbuf\queryloaders.c" />
                </Filter>
        </Files>
        <Globals>
diff --git a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in 
b/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
similarity index 95%
rename from build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
rename to win32/vs9/gdk-pixbuf-version-paths.vsprops.in
index 84b3ec7..7aa59cf 100644
--- a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
+++ b/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
@@ -26,7 +26,7 @@
        />
        <UserMacro
                Name="GlibEtcInstallRoot"
-               Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+               Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
        />
        <UserMacro
                Name="DefDir"
diff --git a/build/win32/vs9/gdk-pixbuf.sln b/win32/vs9/gdk-pixbuf.sln
similarity index 100%
rename from build/win32/vs9/gdk-pixbuf.sln
rename to win32/vs9/gdk-pixbuf.sln
diff --git a/build/win32/vs9/gdk-pixbuf.vcprojin b/win32/vs9/gdk-pixbuf.vcprojin
similarity index 92%
rename from build/win32/vs9/gdk-pixbuf.vcprojin
rename to win32/vs9/gdk-pixbuf.vcprojin
index 5a41944..acb8a2e 100644
--- a/build/win32/vs9/gdk-pixbuf.vcprojin
+++ b/win32/vs9/gdk-pixbuf.vcprojin
@@ -302,57 +302,57 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
 #include "gdk-pixbuf.sourcefiles"
-                       <File RelativePath="..\..\..\gdk-pixbuf\pixops\pixops.c" />
+                       <File RelativePath="..\..\gdk-pixbuf\pixops\pixops.c" />
                        <Filter Name="Native" >
-                               <File RelativePath="..\..\..\gdk-pixbuf\io-gdip-animation.c" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-animation.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-bmp.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-emf.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-gif.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-ico.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-jpeg.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-tiff.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-utils.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gdip-wmf.c" >
                                        <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>
@@ -360,43 +360,43 @@
                                </File>
                        </Filter>
                        <Filter Name="Non-Native" >
-                               <File RelativePath="..\..\..\gdk-pixbuf\io-bmp.c" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-bmp.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-gif.c" >
                                        <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-animation.c">
+                               <File RelativePath="..\..\gdk-pixbuf\io-gif-animation.c">
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-ico.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-jasper.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-jpeg.c" >
                                        <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" >
+                               <File RelativePath="..\..\gdk-pixbuf\io-tiff.c" >
                                        <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>

@@ -415,65 +415,65 @@
                        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">
+                       <File RelativePath="..\..\config.h.win32">
                                <FileConfiguration Name="Debug_GDI+|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release_GDI+|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug_GDI+|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release_GDI+|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(GenConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\config.h"
                                        />
                                </FileConfiguration>
                        </File>
-                       <File RelativePath="..\..\..\gdk-pixbuf\gdk_pixbuf.rc" />
+                       <File RelativePath="..\..\gdk-pixbuf\gdk_pixbuf.rc" />
                </Filter>
        </Files>
        <Globals>
diff --git a/build/win32/vs9/math.h b/win32/vs9/math.h
similarity index 100%
rename from build/win32/vs9/math.h
rename to win32/vs9/math.h

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