From d68f948d463f120eca24cb6103c309dcd409d1c3 Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 7 Oct 2008 22:06:57 +0000 Subject: [PATCH] Reorganise win32 files and add proper svn:ignore properties everywhere. git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2899 92316355-f0b4-4df1-b90c-862c8a59935f --- Makefile.am | 1 + configure.ac | 1 + win32/Makefile.am | 4 ++ .../contrib => win32}/assembly/atk-sharp.dll | Bin .../contrib => win32}/assembly/gdk-sharp.dll | Bin .../assembly/glade-sharp.dll | Bin .../contrib => win32}/assembly/glib-sharp.dll | Bin .../contrib => win32}/assembly/gtk-sharp.dll | Bin .../assembly/gtkglarea-sharp.dll | Bin .../assembly/pango-sharp.dll | Bin win32/config.h | 52 ++++++++++++++++++ .../dist/bin/gdksharpglue-2.dll | Bin .../dist/bin/gladesharpglue-2.dll | Bin .../dist/bin/glibsharpglue-2.dll | Bin .../dist/bin/gtksharpglue-2.dll | Bin {ThePimp/contrib => win32}/dist/bin/iconv.dll | Bin {ThePimp/contrib => win32}/dist/bin/intl.dll | Bin .../dist/bin/libatk-1.0-0.dll | Bin .../contrib => win32}/dist/bin/libcairo-2.dll | Bin .../dist/bin/libgdk-win32-2.0-0.dll | Bin .../dist/bin/libgdk_pixbuf-2.0-0.dll | Bin .../dist/bin/libglade-2.0-0.dll | Bin .../dist/bin/libglib-2.0-0.dll | Bin .../dist/bin/libgmodule-2.0-0.dll | Bin .../dist/bin/libgobject-2.0-0.dll | Bin .../dist/bin/libgthread-2.0-0.dll | Bin .../dist/bin/libgtk-win32-2.0-0.dll | Bin .../dist/bin/libgtkglarea-win32-2.0-0.dll | Bin .../dist/bin/libpango-1.0-0.dll | Bin .../dist/bin/libpangocairo-1.0-0.dll | Bin .../dist/bin/libpangowin32-1.0-0.dll | Bin .../contrib => win32}/dist/bin/libpng13.dll | Bin .../contrib => win32}/dist/bin/libxml2.dll | Bin .../dist/bin/pangosharpglue-2.dll | Bin {ThePimp/contrib => win32}/dist/bin/zlib1.dll | Bin .../dist/etc/gtk-2.0/gdk-pixbuf.loaders | 0 .../dist/etc/gtk-2.0/gtk.immodules | 0 .../contrib => win32}/dist/etc/gtk-2.0/gtkrc | 0 .../lib/gtk-2.0/2.10.0/engines/libpixmap.dll | Bin .../lib/gtk-2.0/2.10.0/engines/libsvg.dll | Bin .../lib/gtk-2.0/2.10.0/engines/libwimp.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-am-et.dll | Bin .../gtk-2.0/2.10.0/immodules/im-cedilla.dll | Bin .../2.10.0/immodules/im-cyrillic-translit.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-ime.dll | Bin .../gtk-2.0/2.10.0/immodules/im-inuktitut.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-ipa.dll | Bin .../2.10.0/immodules/im-thai-broken.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll | Bin .../lib/gtk-2.0/2.10.0/immodules/im-viqr.dll | Bin .../2.10.0/loaders/libpixbufloader-ani.dll | Bin .../2.10.0/loaders/libpixbufloader-bmp.dll | Bin .../2.10.0/loaders/libpixbufloader-gif.dll | Bin .../2.10.0/loaders/libpixbufloader-ico.dll | Bin .../2.10.0/loaders/libpixbufloader-jpeg.dll | Bin .../2.10.0/loaders/libpixbufloader-pcx.dll | Bin .../2.10.0/loaders/libpixbufloader-png.dll | Bin .../2.10.0/loaders/libpixbufloader-pnm.dll | Bin .../2.10.0/loaders/libpixbufloader-ras.dll | Bin .../2.10.0/loaders/libpixbufloader-tga.dll | Bin .../2.10.0/loaders/libpixbufloader-tiff.dll | Bin .../2.10.0/loaders/libpixbufloader-wbmp.dll | Bin .../2.10.0/loaders/libpixbufloader-xbm.dll | Bin .../2.10.0/loaders/libpixbufloader-xpm.dll | Bin .../lib/gtk-2.0/2.10.0/loaders/svg_loader.dll | Bin .../dist/lib/gtk-2.0/include/gdkconfig.h | 0 .../dist/lib/gtk-2.0/modules/libgail.dll | Bin .../share/themes/Default/gtk-2.0-key/gtkrc | 0 .../dist/share/themes/Emacs/gtk-2.0-key/gtkrc | 0 .../share/themes/MS-Windows/gtk-2.0/gtkrc | 0 .../dist/share/themes/Raleigh/gtk-2.0/gtkrc | 0 72 files changed, 58 insertions(+) create mode 100644 win32/Makefile.am rename {ThePimp/contrib => win32}/assembly/atk-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/gdk-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/glade-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/glib-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/gtk-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/gtkglarea-sharp.dll (100%) rename {ThePimp/contrib => win32}/assembly/pango-sharp.dll (100%) create mode 100644 win32/config.h rename {ThePimp/contrib => win32}/dist/bin/gdksharpglue-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/gladesharpglue-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/glibsharpglue-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/gtksharpglue-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/iconv.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/intl.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libatk-1.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libcairo-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgdk-win32-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgdk_pixbuf-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libglade-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libglib-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgmodule-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgobject-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgthread-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgtk-win32-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libgtkglarea-win32-2.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libpango-1.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libpangocairo-1.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libpangowin32-1.0-0.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libpng13.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/libxml2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/pangosharpglue-2.dll (100%) rename {ThePimp/contrib => win32}/dist/bin/zlib1.dll (100%) rename {ThePimp/contrib => win32}/dist/etc/gtk-2.0/gdk-pixbuf.loaders (100%) rename {ThePimp/contrib => win32}/dist/etc/gtk-2.0/gtk.immodules (100%) rename {ThePimp/contrib => win32}/dist/etc/gtk-2.0/gtkrc (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-ime.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/include/gdkconfig.h (100%) rename {ThePimp/contrib => win32}/dist/lib/gtk-2.0/modules/libgail.dll (100%) rename {ThePimp/contrib => win32}/dist/share/themes/Default/gtk-2.0-key/gtkrc (100%) rename {ThePimp/contrib => win32}/dist/share/themes/Emacs/gtk-2.0-key/gtkrc (100%) rename {ThePimp/contrib => win32}/dist/share/themes/MS-Windows/gtk-2.0/gtkrc (100%) rename {ThePimp/contrib => win32}/dist/share/themes/Raleigh/gtk-2.0/gtkrc (100%) diff --git a/Makefile.am b/Makefile.am index eed1dab..61fa2f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ # $Id$ SUBDIRS = pipi src genethumb examples test pipi-sharp ThePimp +DIST_SUBDIRS = $(SUBDIRS) win32 EXTRA_DIST = bootstrap build-win32 common.h NOTES AUTOMAKE_OPTIONS = dist-bzip2 diff --git a/configure.ac b/configure.ac index 06076d3..017672f 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ AC_CONFIG_FILES([ test/Makefile pipi-sharp/Makefile ThePimp/Makefile + win32/Makefile ]) AC_CONFIG_FILES([ pipi/pipi.pc diff --git a/win32/Makefile.am b/win32/Makefile.am new file mode 100644 index 0000000..4ea4d99 --- /dev/null +++ b/win32/Makefile.am @@ -0,0 +1,4 @@ +# $Id$ + +EXTRA_DIST = config.h + diff --git a/ThePimp/contrib/assembly/atk-sharp.dll b/win32/assembly/atk-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/atk-sharp.dll rename to win32/assembly/atk-sharp.dll diff --git a/ThePimp/contrib/assembly/gdk-sharp.dll b/win32/assembly/gdk-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/gdk-sharp.dll rename to win32/assembly/gdk-sharp.dll diff --git a/ThePimp/contrib/assembly/glade-sharp.dll b/win32/assembly/glade-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/glade-sharp.dll rename to win32/assembly/glade-sharp.dll diff --git a/ThePimp/contrib/assembly/glib-sharp.dll b/win32/assembly/glib-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/glib-sharp.dll rename to win32/assembly/glib-sharp.dll diff --git a/ThePimp/contrib/assembly/gtk-sharp.dll b/win32/assembly/gtk-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/gtk-sharp.dll rename to win32/assembly/gtk-sharp.dll diff --git a/ThePimp/contrib/assembly/gtkglarea-sharp.dll b/win32/assembly/gtkglarea-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/gtkglarea-sharp.dll rename to win32/assembly/gtkglarea-sharp.dll diff --git a/ThePimp/contrib/assembly/pango-sharp.dll b/win32/assembly/pango-sharp.dll similarity index 100% rename from ThePimp/contrib/assembly/pango-sharp.dll rename to win32/assembly/pango-sharp.dll diff --git a/win32/config.h b/win32/config.h new file mode 100644 index 0000000..042fdf1 --- /dev/null +++ b/win32/config.h @@ -0,0 +1,52 @@ +/* $Id$ */ + +/* #undef HAVE_ENDIAN_H */ +#define HAVE_ERRNO_H 1 +#define HAVE_GETENV 1 +/* #undef HAVE_GETTIMEOFDAY */ +/* #undef HAVE_INTTYPES_H */ +/* #undef HAVE_IOCTL */ +#define HAVE_MEMORY_H 1 +/* #undef HAVE_NCURSES_H */ +#define HAVE_PUTENV 1 +/* #undef HAVE_SIGNAL */ +/* #undef HAVE_SIGNAL_H */ +/* #undef HAVE_SLANG_H */ +/* #undef HAVE_SLANG_SLANG_H */ +#define HAVE_SLEEP 1 +/* #undef HAVE_STDINT_H */ +#define HAVE_STDLIB_H 1 +/* #undef HAVE_STRCASECMP */ +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +/* #undef HAVE_SYS_IOCTL_H */ +#define HAVE_SYS_STAT_H 1 +/* #undef HAVE_SYS_TIME_H */ +#define HAVE_SYS_TYPES_H 1 +/* #undef HAVE_UNISTD_H */ +/* #undef HAVE_USLEEP */ +/* #undef HAVE_VSNPRINTF */ +#define HAVE_SNPRINTF 1 +#define HAVE_WINDOWS_H 1 +/* #undef HAVE_X11_XKBLIB_H */ +/* #undef NO_MINUS_C_MINUS_O */ +#define PACKAGE_BUGREPORT "" +#define PACKAGE_NAME "libpipi" +#define PACKAGE_STRING "" +#define PACKAGE_TARNAME "" +#define PACKAGE_VERSION "" +/* #undef RETSIGTYPE */ +#define STDC_HEADERS 1 +/* #undef USE_SDL */ +/* #undef USE_OPENCV */ +/* #undef USE_IMLIB2 */ +#define USE_GDI 1 +/* #undef USE_COCOA */ +#define VERSION "0.0" +/* #undef const */ +#ifndef __cplusplus +#define inline __inline +#endif +#define strcasecmp stricmp +#define snprintf _snprintf + diff --git a/ThePimp/contrib/dist/bin/gdksharpglue-2.dll b/win32/dist/bin/gdksharpglue-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/gdksharpglue-2.dll rename to win32/dist/bin/gdksharpglue-2.dll diff --git a/ThePimp/contrib/dist/bin/gladesharpglue-2.dll b/win32/dist/bin/gladesharpglue-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/gladesharpglue-2.dll rename to win32/dist/bin/gladesharpglue-2.dll diff --git a/ThePimp/contrib/dist/bin/glibsharpglue-2.dll b/win32/dist/bin/glibsharpglue-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/glibsharpglue-2.dll rename to win32/dist/bin/glibsharpglue-2.dll diff --git a/ThePimp/contrib/dist/bin/gtksharpglue-2.dll b/win32/dist/bin/gtksharpglue-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/gtksharpglue-2.dll rename to win32/dist/bin/gtksharpglue-2.dll diff --git a/ThePimp/contrib/dist/bin/iconv.dll b/win32/dist/bin/iconv.dll similarity index 100% rename from ThePimp/contrib/dist/bin/iconv.dll rename to win32/dist/bin/iconv.dll diff --git a/ThePimp/contrib/dist/bin/intl.dll b/win32/dist/bin/intl.dll similarity index 100% rename from ThePimp/contrib/dist/bin/intl.dll rename to win32/dist/bin/intl.dll diff --git a/ThePimp/contrib/dist/bin/libatk-1.0-0.dll b/win32/dist/bin/libatk-1.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libatk-1.0-0.dll rename to win32/dist/bin/libatk-1.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libcairo-2.dll b/win32/dist/bin/libcairo-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libcairo-2.dll rename to win32/dist/bin/libcairo-2.dll diff --git a/ThePimp/contrib/dist/bin/libgdk-win32-2.0-0.dll b/win32/dist/bin/libgdk-win32-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgdk-win32-2.0-0.dll rename to win32/dist/bin/libgdk-win32-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgdk_pixbuf-2.0-0.dll b/win32/dist/bin/libgdk_pixbuf-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgdk_pixbuf-2.0-0.dll rename to win32/dist/bin/libgdk_pixbuf-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libglade-2.0-0.dll b/win32/dist/bin/libglade-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libglade-2.0-0.dll rename to win32/dist/bin/libglade-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libglib-2.0-0.dll b/win32/dist/bin/libglib-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libglib-2.0-0.dll rename to win32/dist/bin/libglib-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgmodule-2.0-0.dll b/win32/dist/bin/libgmodule-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgmodule-2.0-0.dll rename to win32/dist/bin/libgmodule-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgobject-2.0-0.dll b/win32/dist/bin/libgobject-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgobject-2.0-0.dll rename to win32/dist/bin/libgobject-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgthread-2.0-0.dll b/win32/dist/bin/libgthread-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgthread-2.0-0.dll rename to win32/dist/bin/libgthread-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgtk-win32-2.0-0.dll b/win32/dist/bin/libgtk-win32-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgtk-win32-2.0-0.dll rename to win32/dist/bin/libgtk-win32-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libgtkglarea-win32-2.0-0.dll b/win32/dist/bin/libgtkglarea-win32-2.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libgtkglarea-win32-2.0-0.dll rename to win32/dist/bin/libgtkglarea-win32-2.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libpango-1.0-0.dll b/win32/dist/bin/libpango-1.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libpango-1.0-0.dll rename to win32/dist/bin/libpango-1.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libpangocairo-1.0-0.dll b/win32/dist/bin/libpangocairo-1.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libpangocairo-1.0-0.dll rename to win32/dist/bin/libpangocairo-1.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libpangowin32-1.0-0.dll b/win32/dist/bin/libpangowin32-1.0-0.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libpangowin32-1.0-0.dll rename to win32/dist/bin/libpangowin32-1.0-0.dll diff --git a/ThePimp/contrib/dist/bin/libpng13.dll b/win32/dist/bin/libpng13.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libpng13.dll rename to win32/dist/bin/libpng13.dll diff --git a/ThePimp/contrib/dist/bin/libxml2.dll b/win32/dist/bin/libxml2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/libxml2.dll rename to win32/dist/bin/libxml2.dll diff --git a/ThePimp/contrib/dist/bin/pangosharpglue-2.dll b/win32/dist/bin/pangosharpglue-2.dll similarity index 100% rename from ThePimp/contrib/dist/bin/pangosharpglue-2.dll rename to win32/dist/bin/pangosharpglue-2.dll diff --git a/ThePimp/contrib/dist/bin/zlib1.dll b/win32/dist/bin/zlib1.dll similarity index 100% rename from ThePimp/contrib/dist/bin/zlib1.dll rename to win32/dist/bin/zlib1.dll diff --git a/ThePimp/contrib/dist/etc/gtk-2.0/gdk-pixbuf.loaders b/win32/dist/etc/gtk-2.0/gdk-pixbuf.loaders similarity index 100% rename from ThePimp/contrib/dist/etc/gtk-2.0/gdk-pixbuf.loaders rename to win32/dist/etc/gtk-2.0/gdk-pixbuf.loaders diff --git a/ThePimp/contrib/dist/etc/gtk-2.0/gtk.immodules b/win32/dist/etc/gtk-2.0/gtk.immodules similarity index 100% rename from ThePimp/contrib/dist/etc/gtk-2.0/gtk.immodules rename to win32/dist/etc/gtk-2.0/gtk.immodules diff --git a/ThePimp/contrib/dist/etc/gtk-2.0/gtkrc b/win32/dist/etc/gtk-2.0/gtkrc similarity index 100% rename from ThePimp/contrib/dist/etc/gtk-2.0/gtkrc rename to win32/dist/etc/gtk-2.0/gtkrc diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll b/win32/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll rename to win32/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll b/win32/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll rename to win32/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll b/win32/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll rename to win32/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ime.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ime.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ime.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ime.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll b/win32/dist/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll rename to win32/dist/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll b/win32/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll rename to win32/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/include/gdkconfig.h b/win32/dist/lib/gtk-2.0/include/gdkconfig.h similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/include/gdkconfig.h rename to win32/dist/lib/gtk-2.0/include/gdkconfig.h diff --git a/ThePimp/contrib/dist/lib/gtk-2.0/modules/libgail.dll b/win32/dist/lib/gtk-2.0/modules/libgail.dll similarity index 100% rename from ThePimp/contrib/dist/lib/gtk-2.0/modules/libgail.dll rename to win32/dist/lib/gtk-2.0/modules/libgail.dll diff --git a/ThePimp/contrib/dist/share/themes/Default/gtk-2.0-key/gtkrc b/win32/dist/share/themes/Default/gtk-2.0-key/gtkrc similarity index 100% rename from ThePimp/contrib/dist/share/themes/Default/gtk-2.0-key/gtkrc rename to win32/dist/share/themes/Default/gtk-2.0-key/gtkrc diff --git a/ThePimp/contrib/dist/share/themes/Emacs/gtk-2.0-key/gtkrc b/win32/dist/share/themes/Emacs/gtk-2.0-key/gtkrc similarity index 100% rename from ThePimp/contrib/dist/share/themes/Emacs/gtk-2.0-key/gtkrc rename to win32/dist/share/themes/Emacs/gtk-2.0-key/gtkrc diff --git a/ThePimp/contrib/dist/share/themes/MS-Windows/gtk-2.0/gtkrc b/win32/dist/share/themes/MS-Windows/gtk-2.0/gtkrc similarity index 100% rename from ThePimp/contrib/dist/share/themes/MS-Windows/gtk-2.0/gtkrc rename to win32/dist/share/themes/MS-Windows/gtk-2.0/gtkrc diff --git a/ThePimp/contrib/dist/share/themes/Raleigh/gtk-2.0/gtkrc b/win32/dist/share/themes/Raleigh/gtk-2.0/gtkrc similarity index 100% rename from ThePimp/contrib/dist/share/themes/Raleigh/gtk-2.0/gtkrc rename to win32/dist/share/themes/Raleigh/gtk-2.0/gtkrc