# HG changeset patch
# User William <address@hidden>
# Date 1332107094 -3600
# Node ID cfbd110943a2f45529a610d52795eb97681b9a0a
# Parent  909169e06d0a646c1964c734afa3796dc5c5c2a3
Support for multitarget. Changes in Makefile, and src/*.mk moved in
src/mingw/*.mk. There may still be actions to do about the 'SRC' directory
and target 'dist' in the Makefile.

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,21 @@
 # See doc/index.html for further information.
 
 JOBS               := 1
+SRC                := mingw
 TARGET             := i686-pc-mingw32
 SOURCEFORGE_MIRROR := kent.dl.sourceforge.net
 
 PWD        := $(shell pwd)
 PREFIX     := $(PWD)/usr
-LOG_DIR    := $(PWD)/log
+LOG_DIR    := $(PWD)/log/$(TARGET)
 TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
+INST_DIR   := $(PREFIX)/installed/$(TARGET)
 PKG_DIR    := $(PWD)/pkg
 DIST_DIR   := $(PWD)/dist
 TMP_DIR     = $(PWD)/tmp-$(1)
 MAKEFILE   := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))
+SRC_DIR    := $(TOP_DIR)/src/$(SRC)
 PATH       := $(PREFIX)/bin:$(PATH)
 SHELL      := bash
 INSTALL    := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
@@ -39,8 +42,8 @@
 SHORT_PKG_VERSION = \
     $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))
 
-PKGS := $(sort $(patsubst $(TOP_DIR)/src/%.mk,%,$(wildcard $(TOP_DIR)/src/*.mk)))
-include $(TOP_DIR)/src/*.mk
+PKGS := $(sort $(patsubst $(SRC_DIR)/%.mk,%,$(wildcard $(SRC_DIR)/*.mk)))
+include $(SRC_DIR)/*.mk
 
 UNPACK_ARCHIVE = \
     $(if $(filter %.tgz,     $(1)),tar xzf '$(1)', \
@@ -86,11 +89,11 @@
     fi
 
 endef
-check-requirements: $(PREFIX)/installed/check-requirements
-$(PREFIX)/installed/check-requirements: $(MAKEFILE)
+check-requirements: $(INST_DIR)/check-requirements
+$(INST_DIR)/check-requirements: $(MAKEFILE)
 	@echo '[check requirements]'
 	$(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT)))
-	@[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
+	@[ -d '$(INST_DIR)' ] || mkdir -p '$(INST_DIR)'
 	@touch '$@'
 
 .PHONY: download
@@ -105,11 +108,11 @@
 	fi
 
 .PHONY: $(1)
-$(1): $(PREFIX)/installed/$(1)
-$(PREFIX)/installed/$(1): $(TOP_DIR)/src/$(1).mk \
-                          $(wildcard $(TOP_DIR)/src/$(1)-*.patch) \
-                          $(wildcard $(TOP_DIR)/src/$(1)-test*) \
-                          $(addprefix $(PREFIX)/installed/,$($(1)_DEPS)) \
+$(1): $(INST_DIR)/$(1)
+$(INST_DIR)/$(1): $(SRC_DIR)/$(1).mk \
+                          $(wildcard $(SRC_DIR)/$(1)-*.patch) \
+                          $(wildcard $(SRC_DIR)/$(1)-test*) \
+                          $(addprefix $(INST_DIR)/,$($(1)_DEPS)) \
                           | check-requirements
 	@[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
 	@if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \
@@ -151,14 +154,14 @@
 	    mkdir -p '$(2)'
 	    cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1))
 	    cd '$(2)/$($(1)_SUBDIR)'
-	    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)),
+	    $(foreach PKG_PATCH,$(sort $(wildcard $(SRC_DIR)/$(1)-*.patch)),
 	        (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
-	    $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test)
+	    $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(SRC_DIR)/$(1)-test)
 	    (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'
 	    rm -rfv  '$(2)'
 	    ,)
-	[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
-	touch '$(PREFIX)/installed/$(1)'
+	[ -d '$(INST_DIR)' ] || mkdir -p '$(INST_DIR)'
+	touch '$(INST_DIR)/$(1)'
 endef
 $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG)))))
 
@@ -205,9 +208,9 @@
             $(if $(filter $(2),$($(1)_VERSION)),
                 $(info .        $(1)  $(2)),
                 $(info NEW      $(1)  $($(1)_VERSION) --> $(2))
-                $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' -i '$(TOP_DIR)/src/$(1).mk'
+                $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' -i '$(SRC_DIR)/$(1).mk'
                 $(MAKE) -f '$(MAKEFILE)' 'update-checksum-$(1)' \
-                    || { $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' -i '$(TOP_DIR)/src/$(1).mk'; \
+                    || { $(SED) 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' -i '$(SRC_DIR)/$(1).mk'; \
                          exit 1; })),
         $(error Unable to update version number of package $(1)))
 
@@ -217,7 +220,7 @@
 
 update-checksum-%:
 	$(call DOWNLOAD_PKG_ARCHIVE,$*)
-	$(SED) 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' -i '$(TOP_DIR)/src/$*.mk'
+	$(SED) 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' -i '$(SRC_DIR)/$*.mk'
 
 .PHONY: dist
 dist:
@@ -244,9 +247,9 @@
 	>'$(DIST_DIR)/mingw-cross-env-$(VERSION)/doc/index.html'
 	cp -p '$(TOP_DIR)/doc'/screenshot-* '$(DIST_DIR)/mingw-cross-env-$(VERSION)/doc/'
 	cp -p '$(TOP_DIR)/Makefile'    '$(DIST_DIR)/mingw-cross-env-$(VERSION)/'
-	cp -p '$(TOP_DIR)/src'/*.mk    '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
-	cp -p '$(TOP_DIR)/src'/*.patch '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
-	cp -p '$(TOP_DIR)/src'/*-test* '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
+	cp -p '$(SRC_DIR)'/*.mk    '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
+	cp -p '$(SRC_DIR)'/*.patch '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
+	cp -p '$(SRC_DIR)'/*-test* '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
 	(cd '$(DIST_DIR)' && tar cvf - 'mingw-cross-env-$(VERSION)' | gzip -9) >'$(DIST_DIR)/mingw-cross-env-$(VERSION).tar.gz'
 	@echo
 	@echo 'Upload will start in 5 seconds. Last chance to cancel! (Ctrl+C)'
diff --git a/src/agg.mk b/src/mingw/agg.mk
rename from src/agg.mk
rename to src/mingw/agg.mk
diff --git a/src/atk.mk b/src/mingw/atk.mk
rename from src/atk.mk
rename to src/mingw/atk.mk
diff --git a/src/atkmm.mk b/src/mingw/atkmm.mk
rename from src/atkmm.mk
rename to src/mingw/atkmm.mk
diff --git a/src/aubio-1-fix-pkg-config.patch b/src/mingw/aubio-1-fix-pkg-config.patch
rename from src/aubio-1-fix-pkg-config.patch
rename to src/mingw/aubio-1-fix-pkg-config.patch
diff --git a/src/aubio.mk b/src/mingw/aubio.mk
rename from src/aubio.mk
rename to src/mingw/aubio.mk
diff --git a/src/bfd.mk b/src/mingw/bfd.mk
rename from src/bfd.mk
rename to src/mingw/bfd.mk
diff --git a/src/binutils.mk b/src/mingw/binutils.mk
rename from src/binutils.mk
rename to src/mingw/binutils.mk
diff --git a/src/blas.mk b/src/mingw/blas.mk
rename from src/blas.mk
rename to src/mingw/blas.mk
diff --git a/src/boost-test.cpp b/src/mingw/boost-test.cpp
rename from src/boost-test.cpp
rename to src/mingw/boost-test.cpp
diff --git a/src/boost.mk b/src/mingw/boost.mk
rename from src/boost.mk
rename to src/mingw/boost.mk
diff --git a/src/bzip2.mk b/src/mingw/bzip2.mk
rename from src/bzip2.mk
rename to src/mingw/bzip2.mk
diff --git a/src/cairo.mk b/src/mingw/cairo.mk
rename from src/cairo.mk
rename to src/mingw/cairo.mk
diff --git a/src/cairomm.mk b/src/mingw/cairomm.mk
rename from src/cairomm.mk
rename to src/mingw/cairomm.mk
diff --git a/src/cblas.mk b/src/mingw/cblas.mk
rename from src/cblas.mk
rename to src/mingw/cblas.mk
diff --git a/src/cgal-1-fixes.patch b/src/mingw/cgal-1-fixes.patch
rename from src/cgal-1-fixes.patch
rename to src/mingw/cgal-1-fixes.patch
diff --git a/src/cgal.mk b/src/mingw/cgal.mk
rename from src/cgal.mk
rename to src/mingw/cgal.mk
diff --git a/src/cppunit.mk b/src/mingw/cppunit.mk
rename from src/cppunit.mk
rename to src/mingw/cppunit.mk
diff --git a/src/cunit.mk b/src/mingw/cunit.mk
rename from src/cunit.mk
rename to src/mingw/cunit.mk
diff --git a/src/curl-1-fixes.patch b/src/mingw/curl-1-fixes.patch
rename from src/curl-1-fixes.patch
rename to src/mingw/curl-1-fixes.patch
diff --git a/src/curl-test.c b/src/mingw/curl-test.c
rename from src/curl-test.c
rename to src/mingw/curl-test.c
diff --git a/src/curl.mk b/src/mingw/curl.mk
rename from src/curl.mk
rename to src/mingw/curl.mk
diff --git a/src/dbus-1-fixes.patch b/src/mingw/dbus-1-fixes.patch
rename from src/dbus-1-fixes.patch
rename to src/mingw/dbus-1-fixes.patch
diff --git a/src/dbus.mk b/src/mingw/dbus.mk
rename from src/dbus.mk
rename to src/mingw/dbus.mk
diff --git a/src/dcmtk.mk b/src/mingw/dcmtk.mk
rename from src/dcmtk.mk
rename to src/mingw/dcmtk.mk
diff --git a/src/devil-1-png.patch b/src/mingw/devil-1-png.patch
rename from src/devil-1-png.patch
rename to src/mingw/devil-1-png.patch
diff --git a/src/devil.mk b/src/mingw/devil.mk
rename from src/devil.mk
rename to src/mingw/devil.mk
diff --git a/src/eigen.mk b/src/mingw/eigen.mk
rename from src/eigen.mk
rename to src/mingw/eigen.mk
diff --git a/src/exiv2-r2619.patch b/src/mingw/exiv2-r2619.patch
rename from src/exiv2-r2619.patch
rename to src/mingw/exiv2-r2619.patch
diff --git a/src/exiv2-r2646.patch b/src/mingw/exiv2-r2646.patch
rename from src/exiv2-r2646.patch
rename to src/mingw/exiv2-r2646.patch
diff --git a/src/exiv2-r2650.patch b/src/mingw/exiv2-r2650.patch
rename from src/exiv2-r2650.patch
rename to src/mingw/exiv2-r2650.patch
diff --git a/src/exiv2.mk b/src/mingw/exiv2.mk
rename from src/exiv2.mk
rename to src/mingw/exiv2.mk
diff --git a/src/expat.mk b/src/mingw/expat.mk
rename from src/expat.mk
rename to src/mingw/expat.mk
diff --git a/src/faad2-1-uint.patch b/src/mingw/faad2-1-uint.patch
rename from src/faad2-1-uint.patch
rename to src/mingw/faad2-1-uint.patch
diff --git a/src/faad2.mk b/src/mingw/faad2.mk
rename from src/faad2.mk
rename to src/mingw/faad2.mk
diff --git a/src/ffmpeg-1-pkgconfig.patch b/src/mingw/ffmpeg-1-pkgconfig.patch
rename from src/ffmpeg-1-pkgconfig.patch
rename to src/mingw/ffmpeg-1-pkgconfig.patch
diff --git a/src/ffmpeg.mk b/src/mingw/ffmpeg.mk
rename from src/ffmpeg.mk
rename to src/mingw/ffmpeg.mk
diff --git a/src/fftw.mk b/src/mingw/fftw.mk
rename from src/fftw.mk
rename to src/mingw/fftw.mk
diff --git a/src/file-test.c b/src/mingw/file-test.c
rename from src/file-test.c
rename to src/mingw/file-test.c
diff --git a/src/file.mk b/src/mingw/file.mk
rename from src/file.mk
rename to src/mingw/file.mk
diff --git a/src/flac-1-win32.patch b/src/mingw/flac-1-win32.patch
rename from src/flac-1-win32.patch
rename to src/mingw/flac-1-win32.patch
diff --git a/src/flac-2-lwsock32.patch b/src/mingw/flac-2-lwsock32.patch
rename from src/flac-2-lwsock32.patch
rename to src/mingw/flac-2-lwsock32.patch
diff --git a/src/flac.mk b/src/mingw/flac.mk
rename from src/flac.mk
rename to src/mingw/flac.mk
diff --git a/src/fltk-1-darwin-cross-compile.patch b/src/mingw/fltk-1-darwin-cross-compile.patch
rename from src/fltk-1-darwin-cross-compile.patch
rename to src/mingw/fltk-1-darwin-cross-compile.patch
diff --git a/src/fltk-test.cpp b/src/mingw/fltk-test.cpp
rename from src/fltk-test.cpp
rename to src/mingw/fltk-test.cpp
diff --git a/src/fltk.mk b/src/mingw/fltk.mk
rename from src/fltk.mk
rename to src/mingw/fltk.mk
diff --git a/src/fontconfig.mk b/src/mingw/fontconfig.mk
rename from src/fontconfig.mk
rename to src/mingw/fontconfig.mk
diff --git a/src/freeglut-1-fixes.patch b/src/mingw/freeglut-1-fixes.patch
rename from src/freeglut-1-fixes.patch
rename to src/mingw/freeglut-1-fixes.patch
diff --git a/src/freeglut-test.c b/src/mingw/freeglut-test.c
rename from src/freeglut-test.c
rename to src/mingw/freeglut-test.c
diff --git a/src/freeglut.mk b/src/mingw/freeglut.mk
rename from src/freeglut.mk
rename to src/mingw/freeglut.mk
diff --git a/src/freeimage-1-fixes.patch b/src/mingw/freeimage-1-fixes.patch
rename from src/freeimage-1-fixes.patch
rename to src/mingw/freeimage-1-fixes.patch
diff --git a/src/freeimage.mk b/src/mingw/freeimage.mk
rename from src/freeimage.mk
rename to src/mingw/freeimage.mk
diff --git a/src/freetds.mk b/src/mingw/freetds.mk
rename from src/freetds.mk
rename to src/mingw/freetds.mk
diff --git a/src/freetype.mk b/src/mingw/freetype.mk
rename from src/freetype.mk
rename to src/mingw/freetype.mk
diff --git a/src/fribidi-1-fix-gassert.patch b/src/mingw/fribidi-1-fix-gassert.patch
rename from src/fribidi-1-fix-gassert.patch
rename to src/mingw/fribidi-1-fix-gassert.patch
diff --git a/src/fribidi.mk b/src/mingw/fribidi.mk
rename from src/fribidi.mk
rename to src/mingw/fribidi.mk
diff --git a/src/ftgl-1-gl-m4.patch b/src/mingw/ftgl-1-gl-m4.patch
rename from src/ftgl-1-gl-m4.patch
rename to src/mingw/ftgl-1-gl-m4.patch
diff --git a/src/ftgl.mk b/src/mingw/ftgl.mk
rename from src/ftgl.mk
rename to src/mingw/ftgl.mk
diff --git a/src/gc.mk b/src/mingw/gc.mk
rename from src/gc.mk
rename to src/mingw/gc.mk
diff --git a/src/gcc-1-mingw-float.patch b/src/mingw/gcc-1-mingw-float.patch
rename from src/gcc-1-mingw-float.patch
rename to src/mingw/gcc-1-mingw-float.patch
diff --git a/src/gcc-2-darwin-no-pie.patch b/src/mingw/gcc-2-darwin-no-pie.patch
rename from src/gcc-2-darwin-no-pie.patch
rename to src/mingw/gcc-2-darwin-no-pie.patch
diff --git a/src/gcc-gmp.mk b/src/mingw/gcc-gmp.mk
rename from src/gcc-gmp.mk
rename to src/mingw/gcc-gmp.mk
diff --git a/src/gcc-mpc.mk b/src/mingw/gcc-mpc.mk
rename from src/gcc-mpc.mk
rename to src/mingw/gcc-mpc.mk
diff --git a/src/gcc-mpfr.mk b/src/mingw/gcc-mpfr.mk
rename from src/gcc-mpfr.mk
rename to src/mingw/gcc-mpfr.mk
diff --git a/src/gcc.mk b/src/mingw/gcc.mk
rename from src/gcc.mk
rename to src/mingw/gcc.mk
diff --git a/src/gd-1-libpng15.patch b/src/mingw/gd-1-libpng15.patch
rename from src/gd-1-libpng15.patch
rename to src/mingw/gd-1-libpng15.patch
diff --git a/src/gd-test.c b/src/mingw/gd-test.c
rename from src/gd-test.c
rename to src/mingw/gd-test.c
diff --git a/src/gd.mk b/src/mingw/gd.mk
rename from src/gd.mk
rename to src/mingw/gd.mk
diff --git a/src/gdal.mk b/src/mingw/gdal.mk
rename from src/gdal.mk
rename to src/mingw/gdal.mk
diff --git a/src/gdb-1-fix-shell.patch b/src/mingw/gdb-1-fix-shell.patch
rename from src/gdb-1-fix-shell.patch
rename to src/mingw/gdb-1-fix-shell.patch
diff --git a/src/gdb-2-fix-makeinfo.patch b/src/mingw/gdb-2-fix-makeinfo.patch
rename from src/gdb-2-fix-makeinfo.patch
rename to src/mingw/gdb-2-fix-makeinfo.patch
diff --git a/src/gdb.mk b/src/mingw/gdb.mk
rename from src/gdb.mk
rename to src/mingw/gdb.mk
diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/mingw/gdk-pixbuf-1-fixes.patch
rename from src/gdk-pixbuf-1-fixes.patch
rename to src/mingw/gdk-pixbuf-1-fixes.patch
diff --git a/src/gdk-pixbuf.mk b/src/mingw/gdk-pixbuf.mk
rename from src/gdk-pixbuf.mk
rename to src/mingw/gdk-pixbuf.mk
diff --git a/src/geos-test.c b/src/mingw/geos-test.c
rename from src/geos-test.c
rename to src/mingw/geos-test.c
diff --git a/src/geos.mk b/src/mingw/geos.mk
rename from src/geos.mk
rename to src/mingw/geos.mk
diff --git a/src/gettext.mk b/src/mingw/gettext.mk
rename from src/gettext.mk
rename to src/mingw/gettext.mk
diff --git a/src/giflib.mk b/src/mingw/giflib.mk
rename from src/giflib.mk
rename to src/mingw/giflib.mk
diff --git a/src/glew-test.c b/src/mingw/glew-test.c
rename from src/glew-test.c
rename to src/mingw/glew-test.c
diff --git a/src/glew.mk b/src/mingw/glew.mk
rename from src/glew.mk
rename to src/mingw/glew.mk
diff --git a/src/glib-1-fixes.patch b/src/mingw/glib-1-fixes.patch
rename from src/glib-1-fixes.patch
rename to src/mingw/glib-1-fixes.patch
diff --git a/src/glib.mk b/src/mingw/glib.mk
rename from src/glib.mk
rename to src/mingw/glib.mk
diff --git a/src/glibmm.mk b/src/mingw/glibmm.mk
rename from src/glibmm.mk
rename to src/mingw/glibmm.mk
diff --git a/src/gmp.mk b/src/mingw/gmp.mk
rename from src/gmp.mk
rename to src/mingw/gmp.mk
diff --git a/src/gnutls-1-fixes.patch b/src/mingw/gnutls-1-fixes.patch
rename from src/gnutls-1-fixes.patch
rename to src/mingw/gnutls-1-fixes.patch
diff --git a/src/gnutls-test.c b/src/mingw/gnutls-test.c
rename from src/gnutls-test.c
rename to src/mingw/gnutls-test.c
diff --git a/src/gnutls.mk b/src/mingw/gnutls.mk
rename from src/gnutls.mk
rename to src/mingw/gnutls.mk
diff --git a/src/graphicsmagick-1-fix-xml2-config.patch b/src/mingw/graphicsmagick-1-fix-xml2-config.patch
rename from src/graphicsmagick-1-fix-xml2-config.patch
rename to src/mingw/graphicsmagick-1-fix-xml2-config.patch
diff --git a/src/graphicsmagick-test.cpp b/src/mingw/graphicsmagick-test.cpp
rename from src/graphicsmagick-test.cpp
rename to src/mingw/graphicsmagick-test.cpp
diff --git a/src/graphicsmagick.mk b/src/mingw/graphicsmagick.mk
rename from src/graphicsmagick.mk
rename to src/mingw/graphicsmagick.mk
diff --git a/src/gsl-test.c b/src/mingw/gsl-test.c
rename from src/gsl-test.c
rename to src/mingw/gsl-test.c
diff --git a/src/gsl.mk b/src/mingw/gsl.mk
rename from src/gsl.mk
rename to src/mingw/gsl.mk
diff --git a/src/gsoap-1-fixes.patch b/src/mingw/gsoap-1-fixes.patch
rename from src/gsoap-1-fixes.patch
rename to src/mingw/gsoap-1-fixes.patch
diff --git a/src/gsoap.mk b/src/mingw/gsoap.mk
rename from src/gsoap.mk
rename to src/mingw/gsoap.mk
diff --git a/src/gst-plugins-base.mk b/src/mingw/gst-plugins-base.mk
rename from src/gst-plugins-base.mk
rename to src/mingw/gst-plugins-base.mk
diff --git a/src/gst-plugins-good.mk b/src/mingw/gst-plugins-good.mk
rename from src/gst-plugins-good.mk
rename to src/mingw/gst-plugins-good.mk
diff --git a/src/gstreamer.mk b/src/mingw/gstreamer.mk
rename from src/gstreamer.mk
rename to src/mingw/gstreamer.mk
diff --git a/src/gta-test.c b/src/mingw/gta-test.c
rename from src/gta-test.c
rename to src/mingw/gta-test.c
diff --git a/src/gta.mk b/src/mingw/gta.mk
rename from src/gta.mk
rename to src/mingw/gta.mk
diff --git a/src/gtk2-1-fixes.patch b/src/mingw/gtk2-1-fixes.patch
rename from src/gtk2-1-fixes.patch
rename to src/mingw/gtk2-1-fixes.patch
diff --git a/src/gtk2-test.c b/src/mingw/gtk2-test.c
rename from src/gtk2-test.c
rename to src/mingw/gtk2-test.c
diff --git a/src/gtk2.mk b/src/mingw/gtk2.mk
rename from src/gtk2.mk
rename to src/mingw/gtk2.mk
diff --git a/src/gtkglext-1-fixes.patch b/src/mingw/gtkglext-1-fixes.patch
rename from src/gtkglext-1-fixes.patch
rename to src/mingw/gtkglext-1-fixes.patch
diff --git a/src/gtkglext-test.c b/src/mingw/gtkglext-test.c
rename from src/gtkglext-test.c
rename to src/mingw/gtkglext-test.c
diff --git a/src/gtkglext.mk b/src/mingw/gtkglext.mk
rename from src/gtkglext.mk
rename to src/mingw/gtkglext.mk
diff --git a/src/gtkglextmm-1-fixes.patch b/src/mingw/gtkglextmm-1-fixes.patch
rename from src/gtkglextmm-1-fixes.patch
rename to src/mingw/gtkglextmm-1-fixes.patch
diff --git a/src/gtkglextmm-test.cpp b/src/mingw/gtkglextmm-test.cpp
rename from src/gtkglextmm-test.cpp
rename to src/mingw/gtkglextmm-test.cpp
diff --git a/src/gtkglextmm.mk b/src/mingw/gtkglextmm.mk
rename from src/gtkglextmm.mk
rename to src/mingw/gtkglextmm.mk
diff --git a/src/gtkmm2-test.cpp b/src/mingw/gtkmm2-test.cpp
rename from src/gtkmm2-test.cpp
rename to src/mingw/gtkmm2-test.cpp
diff --git a/src/gtkmm2.mk b/src/mingw/gtkmm2.mk
rename from src/gtkmm2.mk
rename to src/mingw/gtkmm2.mk
diff --git a/src/gtksourceview.mk b/src/mingw/gtksourceview.mk
rename from src/gtksourceview.mk
rename to src/mingw/gtksourceview.mk
diff --git a/src/gtksourceviewmm2.mk b/src/mingw/gtksourceviewmm2.mk
rename from src/gtksourceviewmm2.mk
rename to src/mingw/gtksourceviewmm2.mk
diff --git a/src/guile-1-win32.patch b/src/mingw/guile-1-win32.patch
rename from src/guile-1-win32.patch
rename to src/mingw/guile-1-win32.patch
diff --git a/src/guile-test.c b/src/mingw/guile-test.c
rename from src/guile-test.c
rename to src/mingw/guile-test.c
diff --git a/src/guile.mk b/src/mingw/guile.mk
rename from src/guile.mk
rename to src/mingw/guile.mk
diff --git a/src/id3lib-1-win32.patch b/src/mingw/id3lib-1-win32.patch
rename from src/id3lib-1-win32.patch
rename to src/mingw/id3lib-1-win32.patch
diff --git a/src/id3lib.mk b/src/mingw/id3lib.mk
rename from src/id3lib.mk
rename to src/mingw/id3lib.mk
diff --git a/src/ilmbase-1-gcc45-include.patch b/src/mingw/ilmbase-1-gcc45-include.patch
rename from src/ilmbase-1-gcc45-include.patch
rename to src/mingw/ilmbase-1-gcc45-include.patch
diff --git a/src/ilmbase-2-osx-cxxflags.patch b/src/mingw/ilmbase-2-osx-cxxflags.patch
rename from src/ilmbase-2-osx-cxxflags.patch
rename to src/mingw/ilmbase-2-osx-cxxflags.patch
diff --git a/src/ilmbase.mk b/src/mingw/ilmbase.mk
rename from src/ilmbase.mk
rename to src/mingw/ilmbase.mk
diff --git a/src/imagemagick.mk b/src/mingw/imagemagick.mk
rename from src/imagemagick.mk
rename to src/mingw/imagemagick.mk
diff --git a/src/jasper.mk b/src/mingw/jasper.mk
rename from src/jasper.mk
rename to src/mingw/jasper.mk
diff --git a/src/jpeg-test.c b/src/mingw/jpeg-test.c
rename from src/jpeg-test.c
rename to src/mingw/jpeg-test.c
diff --git a/src/jpeg.mk b/src/mingw/jpeg.mk
rename from src/jpeg.mk
rename to src/mingw/jpeg.mk
diff --git a/src/json-c.mk b/src/mingw/json-c.mk
rename from src/json-c.mk
rename to src/mingw/json-c.mk
diff --git a/src/lame.mk b/src/mingw/lame.mk
rename from src/lame.mk
rename to src/mingw/lame.mk
diff --git a/src/lapack.mk b/src/mingw/lapack.mk
rename from src/lapack.mk
rename to src/mingw/lapack.mk
diff --git a/src/lcms-1-fixes.patch b/src/mingw/lcms-1-fixes.patch
rename from src/lcms-1-fixes.patch
rename to src/mingw/lcms-1-fixes.patch
diff --git a/src/lcms.mk b/src/mingw/lcms.mk
rename from src/lcms.mk
rename to src/mingw/lcms.mk
diff --git a/src/lcms1-1-fixes.patch b/src/mingw/lcms1-1-fixes.patch
rename from src/lcms1-1-fixes.patch
rename to src/mingw/lcms1-1-fixes.patch
diff --git a/src/lcms1.mk b/src/mingw/lcms1.mk
rename from src/lcms1.mk
rename to src/mingw/lcms1.mk
diff --git a/src/libarchive-1-fixes.patch b/src/mingw/libarchive-1-fixes.patch
rename from src/libarchive-1-fixes.patch
rename to src/mingw/libarchive-1-fixes.patch
diff --git a/src/libarchive-test.c b/src/mingw/libarchive-test.c
rename from src/libarchive-test.c
rename to src/mingw/libarchive-test.c
diff --git a/src/libarchive.mk b/src/mingw/libarchive.mk
rename from src/libarchive.mk
rename to src/mingw/libarchive.mk
diff --git a/src/libass-test.c b/src/mingw/libass-test.c
rename from src/libass-test.c
rename to src/mingw/libass-test.c
diff --git a/src/libass.mk b/src/mingw/libass.mk
rename from src/libass.mk
rename to src/mingw/libass.mk
diff --git a/src/libcroco.mk b/src/mingw/libcroco.mk
rename from src/libcroco.mk
rename to src/mingw/libcroco.mk
diff --git a/src/libdnet-1-fixes.patch b/src/mingw/libdnet-1-fixes.patch
rename from src/libdnet-1-fixes.patch
rename to src/mingw/libdnet-1-fixes.patch
diff --git a/src/libdnet.mk b/src/mingw/libdnet.mk
rename from src/libdnet.mk
rename to src/mingw/libdnet.mk
diff --git a/src/libevent.mk b/src/mingw/libevent.mk
rename from src/libevent.mk
rename to src/mingw/libevent.mk
diff --git a/src/libffi-test.c b/src/mingw/libffi-test.c
rename from src/libffi-test.c
rename to src/mingw/libffi-test.c
diff --git a/src/libffi.mk b/src/mingw/libffi.mk
rename from src/libffi.mk
rename to src/mingw/libffi.mk
diff --git a/src/libgcrypt.mk b/src/mingw/libgcrypt.mk
rename from src/libgcrypt.mk
rename to src/mingw/libgcrypt.mk
diff --git a/src/libgee.mk b/src/mingw/libgee.mk
rename from src/libgee.mk
rename to src/mingw/libgee.mk
diff --git a/src/libgeotiff.mk b/src/mingw/libgeotiff.mk
rename from src/libgeotiff.mk
rename to src/mingw/libgeotiff.mk
diff --git a/src/libgnurx-1-build-static-lib.patch b/src/mingw/libgnurx-1-build-static-lib.patch
rename from src/libgnurx-1-build-static-lib.patch
rename to src/mingw/libgnurx-1-build-static-lib.patch
diff --git a/src/libgnurx.mk b/src/mingw/libgnurx.mk
rename from src/libgnurx.mk
rename to src/mingw/libgnurx.mk
diff --git a/src/libgomp-test.c b/src/mingw/libgomp-test.c
rename from src/libgomp-test.c
rename to src/mingw/libgomp-test.c
diff --git a/src/libgomp.mk b/src/mingw/libgomp.mk
rename from src/libgomp.mk
rename to src/mingw/libgomp.mk
diff --git a/src/libgpg_error.mk b/src/mingw/libgpg_error.mk
rename from src/libgpg_error.mk
rename to src/mingw/libgpg_error.mk
diff --git a/src/libgsasl-1-fixes.patch b/src/mingw/libgsasl-1-fixes.patch
rename from src/libgsasl-1-fixes.patch
rename to src/mingw/libgsasl-1-fixes.patch
diff --git a/src/libgsasl-test.c b/src/mingw/libgsasl-test.c
rename from src/libgsasl-test.c
rename to src/mingw/libgsasl-test.c
diff --git a/src/libgsasl.mk b/src/mingw/libgsasl.mk
rename from src/libgsasl.mk
rename to src/mingw/libgsasl.mk
diff --git a/src/libgsf-1-fixes.patch b/src/mingw/libgsf-1-fixes.patch
rename from src/libgsf-1-fixes.patch
rename to src/mingw/libgsf-1-fixes.patch
diff --git a/src/libgsf.mk b/src/mingw/libgsf.mk
rename from src/libgsf.mk
rename to src/mingw/libgsf.mk
diff --git a/src/libharu-1-fixes.patch b/src/mingw/libharu-1-fixes.patch
rename from src/libharu-1-fixes.patch
rename to src/mingw/libharu-1-fixes.patch
diff --git a/src/libharu.mk b/src/mingw/libharu.mk
rename from src/libharu.mk
rename to src/mingw/libharu.mk
diff --git a/src/libical-test.c b/src/mingw/libical-test.c
rename from src/libical-test.c
rename to src/mingw/libical-test.c
diff --git a/src/libical.mk b/src/mingw/libical.mk
rename from src/libical.mk
rename to src/mingw/libical.mk
diff --git a/src/libiconv.mk b/src/mingw/libiconv.mk
rename from src/libiconv.mk
rename to src/mingw/libiconv.mk
diff --git a/src/libidn-1-fixes.patch b/src/mingw/libidn-1-fixes.patch
rename from src/libidn-1-fixes.patch
rename to src/mingw/libidn-1-fixes.patch
diff --git a/src/libidn-test.c b/src/mingw/libidn-test.c
rename from src/libidn-test.c
rename to src/mingw/libidn-test.c
diff --git a/src/libidn.mk b/src/mingw/libidn.mk
rename from src/libidn.mk
rename to src/mingw/libidn.mk
diff --git a/src/libircclient-1-fixes.patch b/src/mingw/libircclient-1-fixes.patch
rename from src/libircclient-1-fixes.patch
rename to src/mingw/libircclient-1-fixes.patch
diff --git a/src/libircclient-test.cpp b/src/mingw/libircclient-test.cpp
rename from src/libircclient-test.cpp
rename to src/mingw/libircclient-test.cpp
diff --git a/src/libircclient.mk b/src/mingw/libircclient.mk
rename from src/libircclient.mk
rename to src/mingw/libircclient.mk
diff --git a/src/liblo.mk b/src/mingw/liblo.mk
rename from src/liblo.mk
rename to src/mingw/liblo.mk
diff --git a/src/libmad.mk b/src/mingw/libmad.mk
rename from src/libmad.mk
rename to src/mingw/libmad.mk
diff --git a/src/libmikmod-test.c b/src/mingw/libmikmod-test.c
rename from src/libmikmod-test.c
rename to src/mingw/libmikmod-test.c
diff --git a/src/libmikmod.mk b/src/mingw/libmikmod.mk
rename from src/libmikmod.mk
rename to src/mingw/libmikmod.mk
diff --git a/src/libmng-1-fixes.patch b/src/mingw/libmng-1-fixes.patch
rename from src/libmng-1-fixes.patch
rename to src/mingw/libmng-1-fixes.patch
diff --git a/src/libmng.mk b/src/mingw/libmng.mk
rename from src/libmng.mk
rename to src/mingw/libmng.mk
diff --git a/src/libntlm.mk b/src/mingw/libntlm.mk
rename from src/libntlm.mk
rename to src/mingw/libntlm.mk
diff --git a/src/liboauth-test.c b/src/mingw/liboauth-test.c
rename from src/liboauth-test.c
rename to src/mingw/liboauth-test.c
diff --git a/src/liboauth.mk b/src/mingw/liboauth.mk
rename from src/liboauth.mk
rename to src/mingw/liboauth.mk
diff --git a/src/libodbc++-1-win32.patch b/src/mingw/libodbc++-1-win32.patch
rename from src/libodbc++-1-win32.patch
rename to src/mingw/libodbc++-1-win32.patch
diff --git a/src/libodbc++.mk b/src/mingw/libodbc++.mk
rename from src/libodbc++.mk
rename to src/mingw/libodbc++.mk
diff --git a/src/liboil.mk b/src/mingw/liboil.mk
rename from src/liboil.mk
rename to src/mingw/liboil.mk
diff --git a/src/libpano13.mk b/src/mingw/libpano13.mk
rename from src/libpano13.mk
rename to src/mingw/libpano13.mk
diff --git a/src/libpaper.mk b/src/mingw/libpaper.mk
rename from src/libpaper.mk
rename to src/mingw/libpaper.mk
diff --git a/src/libpng-test.c b/src/mingw/libpng-test.c
rename from src/libpng-test.c
rename to src/mingw/libpng-test.c
diff --git a/src/libpng.mk b/src/mingw/libpng.mk
rename from src/libpng.mk
rename to src/mingw/libpng.mk
diff --git a/src/librsvg-1-fixes.patch b/src/mingw/librsvg-1-fixes.patch
rename from src/librsvg-1-fixes.patch
rename to src/mingw/librsvg-1-fixes.patch
diff --git a/src/librsvg-test.c b/src/mingw/librsvg-test.c
rename from src/librsvg-test.c
rename to src/mingw/librsvg-test.c
diff --git a/src/librsvg.mk b/src/mingw/librsvg.mk
rename from src/librsvg.mk
rename to src/mingw/librsvg.mk
diff --git a/src/libsamplerate.mk b/src/mingw/libsamplerate.mk
rename from src/libsamplerate.mk
rename to src/mingw/libsamplerate.mk
diff --git a/src/libshout-1-fixes.patch b/src/mingw/libshout-1-fixes.patch
rename from src/libshout-1-fixes.patch
rename to src/mingw/libshout-1-fixes.patch
diff --git a/src/libshout.mk b/src/mingw/libshout.mk
rename from src/libshout.mk
rename to src/mingw/libshout.mk
diff --git a/src/libsigc++.mk b/src/mingw/libsigc++.mk
rename from src/libsigc++.mk
rename to src/mingw/libsigc++.mk
diff --git a/src/libsndfile.mk b/src/mingw/libsndfile.mk
rename from src/libsndfile.mk
rename to src/mingw/libsndfile.mk
diff --git a/src/libssh2-1-fixes.patch b/src/mingw/libssh2-1-fixes.patch
rename from src/libssh2-1-fixes.patch
rename to src/mingw/libssh2-1-fixes.patch
diff --git a/src/libssh2-test.c b/src/mingw/libssh2-test.c
rename from src/libssh2-test.c
rename to src/mingw/libssh2-test.c
diff --git a/src/libssh2.mk b/src/mingw/libssh2.mk
rename from src/libssh2.mk
rename to src/mingw/libssh2.mk
diff --git a/src/libtool.mk b/src/mingw/libtool.mk
rename from src/libtool.mk
rename to src/mingw/libtool.mk
diff --git a/src/libunistring.mk b/src/mingw/libunistring.mk
rename from src/libunistring.mk
rename to src/mingw/libunistring.mk
diff --git a/src/libusb.mk b/src/mingw/libusb.mk
rename from src/libusb.mk
rename to src/mingw/libusb.mk
diff --git a/src/libvpx-1-config.patch b/src/mingw/libvpx-1-config.patch
rename from src/libvpx-1-config.patch
rename to src/mingw/libvpx-1-config.patch
diff --git a/src/libvpx-2-fix-bin-bash.patch b/src/mingw/libvpx-2-fix-bin-bash.patch
rename from src/libvpx-2-fix-bin-bash.patch
rename to src/mingw/libvpx-2-fix-bin-bash.patch
diff --git a/src/libvpx.mk b/src/mingw/libvpx.mk
rename from src/libvpx.mk
rename to src/mingw/libvpx.mk
diff --git a/src/libxml++.mk b/src/mingw/libxml++.mk
rename from src/libxml++.mk
rename to src/mingw/libxml++.mk
diff --git a/src/libxml2.mk b/src/mingw/libxml2.mk
rename from src/libxml2.mk
rename to src/mingw/libxml2.mk
diff --git a/src/libxslt.mk b/src/mingw/libxslt.mk
rename from src/libxslt.mk
rename to src/mingw/libxslt.mk
diff --git a/src/llvm.mk b/src/mingw/llvm.mk
rename from src/llvm.mk
rename to src/mingw/llvm.mk
diff --git a/src/lua-test.c b/src/mingw/lua-test.c
rename from src/lua-test.c
rename to src/mingw/lua-test.c
diff --git a/src/lua.mk b/src/mingw/lua.mk
rename from src/lua.mk
rename to src/mingw/lua.mk
diff --git a/src/lzo.mk b/src/mingw/lzo.mk
rename from src/lzo.mk
rename to src/mingw/lzo.mk
diff --git a/src/matio.mk b/src/mingw/matio.mk
rename from src/matio.mk
rename to src/mingw/matio.mk
diff --git a/src/mingw-utils-1-portability-fix.patch b/src/mingw/mingw-utils-1-portability-fix.patch
rename from src/mingw-utils-1-portability-fix.patch
rename to src/mingw/mingw-utils-1-portability-fix.patch
diff --git a/src/mingw-utils.mk b/src/mingw/mingw-utils.mk
rename from src/mingw-utils.mk
rename to src/mingw/mingw-utils.mk
diff --git a/src/mingwrt.mk b/src/mingw/mingwrt.mk
rename from src/mingwrt.mk
rename to src/mingw/mingwrt.mk
diff --git a/src/mpfr.mk b/src/mingw/mpfr.mk
rename from src/mpfr.mk
rename to src/mingw/mpfr.mk
diff --git a/src/muparser.mk b/src/mingw/muparser.mk
rename from src/muparser.mk
rename to src/mingw/muparser.mk
diff --git a/src/mxml-test.c b/src/mingw/mxml-test.c
rename from src/mxml-test.c
rename to src/mingw/mxml-test.c
diff --git a/src/mxml.mk b/src/mingw/mxml.mk
rename from src/mxml.mk
rename to src/mingw/mxml.mk
diff --git a/src/nettle.mk b/src/mingw/nettle.mk
rename from src/nettle.mk
rename to src/mingw/nettle.mk
diff --git a/src/nsis-1-explicit-mingw-cross-prefix.patch b/src/mingw/nsis-1-explicit-mingw-cross-prefix.patch
rename from src/nsis-1-explicit-mingw-cross-prefix.patch
rename to src/mingw/nsis-1-explicit-mingw-cross-prefix.patch
diff --git a/src/nsis.mk b/src/mingw/nsis.mk
rename from src/nsis.mk
rename to src/mingw/nsis.mk
diff --git a/src/ogg.mk b/src/mingw/ogg.mk
rename from src/ogg.mk
rename to src/mingw/ogg.mk
diff --git a/src/old.mk b/src/mingw/old.mk
rename from src/old.mk
rename to src/mingw/old.mk
diff --git a/src/openal-1-luuid-pkg-config.patch b/src/mingw/openal-1-luuid-pkg-config.patch
rename from src/openal-1-luuid-pkg-config.patch
rename to src/mingw/openal-1-luuid-pkg-config.patch
diff --git a/src/openal-2-guid-static-link.patch b/src/mingw/openal-2-guid-static-link.patch
rename from src/openal-2-guid-static-link.patch
rename to src/mingw/openal-2-guid-static-link.patch
diff --git a/src/openal-test.c b/src/mingw/openal-test.c
rename from src/openal-test.c
rename to src/mingw/openal-test.c
diff --git a/src/openal.mk b/src/mingw/openal.mk
rename from src/openal.mk
rename to src/mingw/openal.mk
diff --git a/src/opencore-amr.mk b/src/mingw/opencore-amr.mk
rename from src/opencore-amr.mk
rename to src/mingw/opencore-amr.mk
diff --git a/src/opencsg-1-fixes.patch b/src/mingw/opencsg-1-fixes.patch
rename from src/opencsg-1-fixes.patch
rename to src/mingw/opencsg-1-fixes.patch
diff --git a/src/opencsg.mk b/src/mingw/opencsg.mk
rename from src/opencsg.mk
rename to src/mingw/opencsg.mk
diff --git a/src/openexr-1-disable-zlib_winapi.patch b/src/mingw/openexr-1-disable-zlib_winapi.patch
rename from src/openexr-1-disable-zlib_winapi.patch
rename to src/mingw/openexr-1-disable-zlib_winapi.patch
diff --git a/src/openexr.mk b/src/mingw/openexr.mk
rename from src/openexr.mk
rename to src/mingw/openexr.mk
diff --git a/src/openscenegraph.mk b/src/mingw/openscenegraph.mk
rename from src/openscenegraph.mk
rename to src/mingw/openscenegraph.mk
diff --git a/src/openssl-1-winsock2.patch b/src/mingw/openssl-1-winsock2.patch
rename from src/openssl-1-winsock2.patch
rename to src/mingw/openssl-1-winsock2.patch
diff --git a/src/openssl.mk b/src/mingw/openssl.mk
rename from src/openssl.mk
rename to src/mingw/openssl.mk
diff --git a/src/pango-1-fixes.patch b/src/mingw/pango-1-fixes.patch
rename from src/pango-1-fixes.patch
rename to src/mingw/pango-1-fixes.patch
diff --git a/src/pango.mk b/src/mingw/pango.mk
rename from src/pango.mk
rename to src/mingw/pango.mk
diff --git a/src/pangomm.mk b/src/mingw/pangomm.mk
rename from src/pangomm.mk
rename to src/mingw/pangomm.mk
diff --git a/src/pcre.mk b/src/mingw/pcre.mk
rename from src/pcre.mk
rename to src/mingw/pcre.mk
diff --git a/src/pdcurses.mk b/src/mingw/pdcurses.mk
rename from src/pdcurses.mk
rename to src/mingw/pdcurses.mk
diff --git a/src/pdflib_lite-1-mingw.patch b/src/mingw/pdflib_lite-1-mingw.patch
rename from src/pdflib_lite-1-mingw.patch
rename to src/mingw/pdflib_lite-1-mingw.patch
diff --git a/src/pdflib_lite.mk b/src/mingw/pdflib_lite.mk
rename from src/pdflib_lite.mk
rename to src/mingw/pdflib_lite.mk
diff --git a/src/pfstools.mk b/src/mingw/pfstools.mk
rename from src/pfstools.mk
rename to src/mingw/pfstools.mk
diff --git a/src/physfs-1-fix-gcc46-warnings.patch b/src/mingw/physfs-1-fix-gcc46-warnings.patch
rename from src/physfs-1-fix-gcc46-warnings.patch
rename to src/mingw/physfs-1-fix-gcc46-warnings.patch
diff --git a/src/physfs-test.c b/src/mingw/physfs-test.c
rename from src/physfs-test.c
rename to src/mingw/physfs-test.c
diff --git a/src/physfs.mk b/src/mingw/physfs.mk
rename from src/physfs.mk
rename to src/mingw/physfs.mk
diff --git a/src/pixman.mk b/src/mingw/pixman.mk
rename from src/pixman.mk
rename to src/mingw/pixman.mk
diff --git a/src/plotmm-1-fixes.patch b/src/mingw/plotmm-1-fixes.patch
rename from src/plotmm-1-fixes.patch
rename to src/mingw/plotmm-1-fixes.patch
diff --git a/src/plotmm.mk b/src/mingw/plotmm.mk
rename from src/plotmm.mk
rename to src/mingw/plotmm.mk
diff --git a/src/plotutils-2.6-libpng-1.5.patch b/src/mingw/plotutils-2.6-libpng-1.5.patch
rename from src/plotutils-2.6-libpng-1.5.patch
rename to src/mingw/plotutils-2.6-libpng-1.5.patch
diff --git a/src/plotutils.mk b/src/mingw/plotutils.mk
rename from src/plotutils.mk
rename to src/mingw/plotutils.mk
diff --git a/src/poco-1-fix-mno-cygwin.patch b/src/mingw/poco-1-fix-mno-cygwin.patch
rename from src/poco-1-fix-mno-cygwin.patch
rename to src/mingw/poco-1-fix-mno-cygwin.patch
diff --git a/src/poco-test.cpp b/src/mingw/poco-test.cpp
rename from src/poco-test.cpp
rename to src/mingw/poco-test.cpp
diff --git a/src/poco.mk b/src/mingw/poco.mk
rename from src/poco.mk
rename to src/mingw/poco.mk
diff --git a/src/popt-1-win32.patch b/src/mingw/popt-1-win32.patch
rename from src/popt-1-win32.patch
rename to src/mingw/popt-1-win32.patch
diff --git a/src/popt.mk b/src/mingw/popt.mk
rename from src/popt.mk
rename to src/mingw/popt.mk
diff --git a/src/portaudio-1-win32.patch b/src/mingw/portaudio-1-win32.patch
rename from src/portaudio-1-win32.patch
rename to src/mingw/portaudio-1-win32.patch
diff --git a/src/portaudio-test.c b/src/mingw/portaudio-test.c
rename from src/portaudio-test.c
rename to src/mingw/portaudio-test.c
diff --git a/src/portaudio.mk b/src/mingw/portaudio.mk
rename from src/portaudio.mk
rename to src/mingw/portaudio.mk
diff --git a/src/postgresql-1-fixes.patch b/src/mingw/postgresql-1-fixes.patch
rename from src/postgresql-1-fixes.patch
rename to src/mingw/postgresql-1-fixes.patch
diff --git a/src/postgresql.mk b/src/mingw/postgresql.mk
rename from src/postgresql.mk
rename to src/mingw/postgresql.mk
diff --git a/src/proj-1-mutex-win32.patch b/src/mingw/proj-1-mutex-win32.patch
rename from src/proj-1-mutex-win32.patch
rename to src/mingw/proj-1-mutex-win32.patch
diff --git a/src/proj.mk b/src/mingw/proj.mk
rename from src/proj.mk
rename to src/mingw/proj.mk
diff --git a/src/pthreads-1-autostatic.patch b/src/mingw/pthreads-1-autostatic.patch
rename from src/pthreads-1-autostatic.patch
rename to src/mingw/pthreads-1-autostatic.patch
diff --git a/src/pthreads-test.c b/src/mingw/pthreads-test.c
rename from src/pthreads-test.c
rename to src/mingw/pthreads-test.c
diff --git a/src/pthreads.mk b/src/mingw/pthreads.mk
rename from src/pthreads.mk
rename to src/mingw/pthreads.mk
diff --git a/src/qjson-1-static.patch b/src/mingw/qjson-1-static.patch
rename from src/qjson-1-static.patch
rename to src/mingw/qjson-1-static.patch
diff --git a/src/qjson.mk b/src/mingw/qjson.mk
rename from src/qjson.mk
rename to src/mingw/qjson.mk
diff --git a/src/qt-1-cherrypicks.patch b/src/mingw/qt-1-cherrypicks.patch
rename from src/qt-1-cherrypicks.patch
rename to src/mingw/qt-1-cherrypicks.patch
diff --git a/src/qt-test.cpp b/src/mingw/qt-test.cpp
rename from src/qt-test.cpp
rename to src/mingw/qt-test.cpp
diff --git a/src/qt-test.pro b/src/mingw/qt-test.pro
rename from src/qt-test.pro
rename to src/mingw/qt-test.pro
diff --git a/src/qt-test.ui b/src/mingw/qt-test.ui
rename from src/qt-test.ui
rename to src/mingw/qt-test.ui
diff --git a/src/qt.mk b/src/mingw/qt.mk
rename from src/qt.mk
rename to src/mingw/qt.mk
diff --git a/src/qwtplot3d-1-fixes.patch b/src/mingw/qwtplot3d-1-fixes.patch
rename from src/qwtplot3d-1-fixes.patch
rename to src/mingw/qwtplot3d-1-fixes.patch
diff --git a/src/qwtplot3d.mk b/src/mingw/qwtplot3d.mk
rename from src/qwtplot3d.mk
rename to src/mingw/qwtplot3d.mk
diff --git a/src/readline.mk b/src/mingw/readline.mk
rename from src/readline.mk
rename to src/mingw/readline.mk
diff --git a/src/sdl-test.c b/src/mingw/sdl-test.c
rename from src/sdl-test.c
rename to src/mingw/sdl-test.c
diff --git a/src/sdl.mk b/src/mingw/sdl.mk
rename from src/sdl.mk
rename to src/mingw/sdl.mk
diff --git a/src/sdl_image-test.c b/src/mingw/sdl_image-test.c
rename from src/sdl_image-test.c
rename to src/mingw/sdl_image-test.c
diff --git a/src/sdl_image.mk b/src/mingw/sdl_image.mk
rename from src/sdl_image.mk
rename to src/mingw/sdl_image.mk
diff --git a/src/sdl_mixer-test.c b/src/mingw/sdl_mixer-test.c
rename from src/sdl_mixer-test.c
rename to src/mingw/sdl_mixer-test.c
diff --git a/src/sdl_mixer.mk b/src/mingw/sdl_mixer.mk
rename from src/sdl_mixer.mk
rename to src/mingw/sdl_mixer.mk
diff --git a/src/sdl_net-1-fixes.patch b/src/mingw/sdl_net-1-fixes.patch
rename from src/sdl_net-1-fixes.patch
rename to src/mingw/sdl_net-1-fixes.patch
diff --git a/src/sdl_net-test.c b/src/mingw/sdl_net-test.c
rename from src/sdl_net-test.c
rename to src/mingw/sdl_net-test.c
diff --git a/src/sdl_net.mk b/src/mingw/sdl_net.mk
rename from src/sdl_net.mk
rename to src/mingw/sdl_net.mk
diff --git a/src/sdl_pango-1-api-adds.patch b/src/mingw/sdl_pango-1-api-adds.patch
rename from src/sdl_pango-1-api-adds.patch
rename to src/mingw/sdl_pango-1-api-adds.patch
diff --git a/src/sdl_pango-2-static-matrices.patch b/src/mingw/sdl_pango-2-static-matrices.patch
rename from src/sdl_pango-2-static-matrices.patch
rename to src/mingw/sdl_pango-2-static-matrices.patch
diff --git a/src/sdl_pango.mk b/src/mingw/sdl_pango.mk
rename from src/sdl_pango.mk
rename to src/mingw/sdl_pango.mk
diff --git a/src/sdl_sound-test.c b/src/mingw/sdl_sound-test.c
rename from src/sdl_sound-test.c
rename to src/mingw/sdl_sound-test.c
diff --git a/src/sdl_sound.mk b/src/mingw/sdl_sound.mk
rename from src/sdl_sound.mk
rename to src/mingw/sdl_sound.mk
diff --git a/src/sdl_ttf.mk b/src/mingw/sdl_ttf.mk
rename from src/sdl_ttf.mk
rename to src/mingw/sdl_ttf.mk
diff --git a/src/smpeg-test.c b/src/mingw/smpeg-test.c
rename from src/smpeg-test.c
rename to src/mingw/smpeg-test.c
diff --git a/src/smpeg.mk b/src/mingw/smpeg.mk
rename from src/smpeg.mk
rename to src/mingw/smpeg.mk
diff --git a/src/speex.mk b/src/mingw/speex.mk
rename from src/speex.mk
rename to src/mingw/speex.mk
diff --git a/src/sqlite.mk b/src/mingw/sqlite.mk
rename from src/sqlite.mk
rename to src/mingw/sqlite.mk
diff --git a/src/suitesparse.mk b/src/mingw/suitesparse.mk
rename from src/suitesparse.mk
rename to src/mingw/suitesparse.mk
diff --git a/src/t4k_common.mk b/src/mingw/t4k_common.mk
rename from src/t4k_common.mk
rename to src/mingw/t4k_common.mk
diff --git a/src/taglib-1-static.patch b/src/mingw/taglib-1-static.patch
rename from src/taglib-1-static.patch
rename to src/mingw/taglib-1-static.patch
diff --git a/src/taglib.mk b/src/mingw/taglib.mk
rename from src/taglib.mk
rename to src/mingw/taglib.mk
diff --git a/src/theora.mk b/src/mingw/theora.mk
rename from src/theora.mk
rename to src/mingw/theora.mk
diff --git a/src/tiff.mk b/src/mingw/tiff.mk
rename from src/tiff.mk
rename to src/mingw/tiff.mk
diff --git a/src/tinyxml-test.cpp b/src/mingw/tinyxml-test.cpp
rename from src/tinyxml-test.cpp
rename to src/mingw/tinyxml-test.cpp
diff --git a/src/tinyxml.mk b/src/mingw/tinyxml.mk
rename from src/tinyxml.mk
rename to src/mingw/tinyxml.mk
diff --git a/src/tre.mk b/src/mingw/tre.mk
rename from src/tre.mk
rename to src/mingw/tre.mk
diff --git a/src/vigra-test.cpp b/src/mingw/vigra-test.cpp
rename from src/vigra-test.cpp
rename to src/mingw/vigra-test.cpp
diff --git a/src/vigra.mk b/src/mingw/vigra.mk
rename from src/vigra.mk
rename to src/mingw/vigra.mk
diff --git a/src/vmime-1-fixes.patch b/src/mingw/vmime-1-fixes.patch
rename from src/vmime-1-fixes.patch
rename to src/mingw/vmime-1-fixes.patch
diff --git a/src/vmime.mk b/src/mingw/vmime.mk
rename from src/vmime.mk
rename to src/mingw/vmime.mk
diff --git a/src/vorbis.mk b/src/mingw/vorbis.mk
rename from src/vorbis.mk
rename to src/mingw/vorbis.mk
diff --git a/src/vtk-1-tryrun.patch b/src/mingw/vtk-1-tryrun.patch
rename from src/vtk-1-tryrun.patch
rename to src/mingw/vtk-1-tryrun.patch
diff --git a/src/vtk-2-findfreetype.patch b/src/mingw/vtk-2-findfreetype.patch
rename from src/vtk-2-findfreetype.patch
rename to src/mingw/vtk-2-findfreetype.patch
diff --git a/src/vtk-3-compile-tools.patch b/src/mingw/vtk-3-compile-tools.patch
rename from src/vtk-3-compile-tools.patch
rename to src/mingw/vtk-3-compile-tools.patch
diff --git a/src/vtk-4-native-no-gui.patch b/src/mingw/vtk-4-native-no-gui.patch
rename from src/vtk-4-native-no-gui.patch
rename to src/mingw/vtk-4-native-no-gui.patch
diff --git a/src/vtk-5-module-path.patch b/src/mingw/vtk-5-module-path.patch
rename from src/vtk-5-module-path.patch
rename to src/mingw/vtk-5-module-path.patch
diff --git a/src/vtk-6-kfreebsd.patch b/src/mingw/vtk-6-kfreebsd.patch
rename from src/vtk-6-kfreebsd.patch
rename to src/mingw/vtk-6-kfreebsd.patch
diff --git a/src/vtk.mk b/src/mingw/vtk.mk
rename from src/vtk.mk
rename to src/mingw/vtk.mk
diff --git a/src/w32api-1-dinput-dsound.patch b/src/mingw/w32api-1-dinput-dsound.patch
rename from src/w32api-1-dinput-dsound.patch
rename to src/mingw/w32api-1-dinput-dsound.patch
diff --git a/src/w32api-2-directx-additions-for-qt.patch b/src/mingw/w32api-2-directx-additions-for-qt.patch
rename from src/w32api-2-directx-additions-for-qt.patch
rename to src/mingw/w32api-2-directx-additions-for-qt.patch
diff --git a/src/w32api.mk b/src/mingw/w32api.mk
rename from src/w32api.mk
rename to src/mingw/w32api.mk
diff --git a/src/winpcap-1-fixes.patch b/src/mingw/winpcap-1-fixes.patch
rename from src/winpcap-1-fixes.patch
rename to src/mingw/winpcap-1-fixes.patch
diff --git a/src/winpcap.mk b/src/mingw/winpcap.mk
rename from src/winpcap.mk
rename to src/mingw/winpcap.mk
diff --git a/src/wt-1-fixes.patch b/src/mingw/wt-1-fixes.patch
rename from src/wt-1-fixes.patch
rename to src/mingw/wt-1-fixes.patch
diff --git a/src/wt.mk b/src/mingw/wt.mk
rename from src/wt.mk
rename to src/mingw/wt.mk
diff --git a/src/wxwidgets-test.cpp b/src/mingw/wxwidgets-test.cpp
rename from src/wxwidgets-test.cpp
rename to src/mingw/wxwidgets-test.cpp
diff --git a/src/wxwidgets.mk b/src/mingw/wxwidgets.mk
rename from src/wxwidgets.mk
rename to src/mingw/wxwidgets.mk
diff --git a/src/x264-1-fix-bin-bash.patch b/src/mingw/x264-1-fix-bin-bash.patch
rename from src/x264-1-fix-bin-bash.patch
rename to src/mingw/x264-1-fix-bin-bash.patch
diff --git a/src/x264.mk b/src/mingw/x264.mk
rename from src/x264.mk
rename to src/mingw/x264.mk
diff --git a/src/xerces-1-fix-pkgconfig.patch b/src/mingw/xerces-1-fix-pkgconfig.patch
rename from src/xerces-1-fix-pkgconfig.patch
rename to src/mingw/xerces-1-fix-pkgconfig.patch
diff --git a/src/xerces-test.cpp b/src/mingw/xerces-test.cpp
rename from src/xerces-test.cpp
rename to src/mingw/xerces-test.cpp
diff --git a/src/xerces.mk b/src/mingw/xerces.mk
rename from src/xerces.mk
rename to src/mingw/xerces.mk
diff --git a/src/xine-lib-1-fixes.patch b/src/mingw/xine-lib-1-fixes.patch
rename from src/xine-lib-1-fixes.patch
rename to src/mingw/xine-lib-1-fixes.patch
diff --git a/src/xine-lib.mk b/src/mingw/xine-lib.mk
rename from src/xine-lib.mk
rename to src/mingw/xine-lib.mk
diff --git a/src/xmlwrapp.mk b/src/mingw/xmlwrapp.mk
rename from src/xmlwrapp.mk
rename to src/mingw/xmlwrapp.mk
diff --git a/src/xvidcore-1-fixes.patch b/src/mingw/xvidcore-1-fixes.patch
rename from src/xvidcore-1-fixes.patch
rename to src/mingw/xvidcore-1-fixes.patch
diff --git a/src/xvidcore.mk b/src/mingw/xvidcore.mk
rename from src/xvidcore.mk
rename to src/mingw/xvidcore.mk
diff --git a/src/xz.mk b/src/mingw/xz.mk
rename from src/xz.mk
rename to src/mingw/xz.mk
diff --git a/src/zlib-1-win32-static.patch b/src/mingw/zlib-1-win32-static.patch
rename from src/zlib-1-win32-static.patch
rename to src/mingw/zlib-1-win32-static.patch
diff --git a/src/zlib.mk b/src/mingw/zlib.mk
rename from src/zlib.mk
rename to src/mingw/zlib.mk
diff --git a/src/zziplib-1-fix-fnmatch.patch b/src/mingw/zziplib-1-fix-fnmatch.patch
rename from src/zziplib-1-fix-fnmatch.patch
rename to src/mingw/zziplib-1-fix-fnmatch.patch
diff --git a/src/zziplib.mk b/src/mingw/zziplib.mk
rename from src/zziplib.mk
rename to src/mingw/zziplib.mk