From 9296bc000dcd1d1a1077495124cd943edbcb2193 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 16 Oct 2008 22:52:40 +0000 Subject: [PATCH] Rename win32/dist into win32/gtksharp because we might very well put other runtimes in SVN. git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2954 92316355-f0b4-4df1-b90c-862c8a59935f --- ThePimp/Makefile.am | 10 +++++----- ThePimp/ThePimp.csproj | 18 +++++++++--------- build-win32 | 2 +- win32/{dist => gtksharp}/bin/Mono.Posix.dll | Bin .../bin/MonoPosixHelper.dll | Bin win32/{dist => gtksharp}/bin/atk-sharp.dll | Bin win32/{dist => gtksharp}/bin/freetype6.dll | Bin win32/{dist => gtksharp}/bin/gdk-sharp.dll | Bin .../{dist => gtksharp}/bin/gdksharpglue-2.dll | Bin win32/{dist => gtksharp}/bin/glade-sharp.dll | Bin .../bin/gladesharpglue-2.dll | Bin win32/{dist => gtksharp}/bin/glib-sharp.dll | Bin .../bin/glibsharpglue-2.dll | Bin win32/{dist => gtksharp}/bin/gtk-sharp.dll | Bin .../{dist => gtksharp}/bin/gtksharpglue-2.dll | Bin win32/{dist => gtksharp}/bin/iconv.dll | Bin win32/{dist => gtksharp}/bin/intl.dll | Bin win32/{dist => gtksharp}/bin/jpeg62.dll | Bin win32/{dist => gtksharp}/bin/libatk-1.0-0.dll | Bin win32/{dist => gtksharp}/bin/libcairo-2.dll | Bin win32/{dist => gtksharp}/bin/libexpat.dll | Bin .../bin/libfontconfig-1.dll | Bin .../bin/libgdk-win32-2.0-0.dll | Bin .../bin/libgdk_pixbuf-2.0-0.dll | Bin .../{dist => gtksharp}/bin/libglade-2.0-0.dll | Bin .../{dist => gtksharp}/bin/libglib-2.0-0.dll | Bin .../bin/libgmodule-2.0-0.dll | Bin .../bin/libgobject-2.0-0.dll | Bin .../bin/libgthread-2.0-0.dll | Bin .../bin/libgtk-win32-2.0-0.dll | Bin .../{dist => gtksharp}/bin/libpango-1.0-0.dll | Bin .../bin/libpangocairo-1.0-0.dll | Bin .../bin/libpangowin32-1.0-0.dll | Bin .../{dist => gtksharp}/bin/libpixman-1-0.dll | Bin win32/{dist => gtksharp}/bin/libpng13.dll | Bin win32/{dist => gtksharp}/bin/librsvg-2-2.dll | Bin win32/{dist => gtksharp}/bin/libtiff3.dll | Bin win32/{dist => gtksharp}/bin/libxml2.dll | Bin win32/{dist => gtksharp}/bin/pango-sharp.dll | Bin .../bin/pangosharpglue-2.dll | Bin win32/{dist => gtksharp}/bin/zlib1.dll | Bin .../etc/gtk-2.0/gdk-pixbuf.loaders | 0 .../etc/gtk-2.0/gtk.immodules | 0 win32/{dist => gtksharp}/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 .../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 .../lib/gtk-2.0/include/gdkconfig.h | 0 .../share/themes/Default/gtkrc | 0 .../share/themes/MS-Windows/gtk-2.0/gtkrc | 0 65 files changed, 15 insertions(+), 15 deletions(-) rename win32/{dist => gtksharp}/bin/Mono.Posix.dll (100%) rename win32/{dist => gtksharp}/bin/MonoPosixHelper.dll (100%) rename win32/{dist => gtksharp}/bin/atk-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/freetype6.dll (100%) rename win32/{dist => gtksharp}/bin/gdk-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/gdksharpglue-2.dll (100%) rename win32/{dist => gtksharp}/bin/glade-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/gladesharpglue-2.dll (100%) rename win32/{dist => gtksharp}/bin/glib-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/glibsharpglue-2.dll (100%) rename win32/{dist => gtksharp}/bin/gtk-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/gtksharpglue-2.dll (100%) rename win32/{dist => gtksharp}/bin/iconv.dll (100%) rename win32/{dist => gtksharp}/bin/intl.dll (100%) rename win32/{dist => gtksharp}/bin/jpeg62.dll (100%) rename win32/{dist => gtksharp}/bin/libatk-1.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libcairo-2.dll (100%) rename win32/{dist => gtksharp}/bin/libexpat.dll (100%) rename win32/{dist => gtksharp}/bin/libfontconfig-1.dll (100%) rename win32/{dist => gtksharp}/bin/libgdk-win32-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libgdk_pixbuf-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libglade-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libglib-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libgmodule-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libgobject-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libgthread-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libgtk-win32-2.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libpango-1.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libpangocairo-1.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libpangowin32-1.0-0.dll (100%) rename win32/{dist => gtksharp}/bin/libpixman-1-0.dll (100%) rename win32/{dist => gtksharp}/bin/libpng13.dll (100%) rename win32/{dist => gtksharp}/bin/librsvg-2-2.dll (100%) rename win32/{dist => gtksharp}/bin/libtiff3.dll (100%) rename win32/{dist => gtksharp}/bin/libxml2.dll (100%) rename win32/{dist => gtksharp}/bin/pango-sharp.dll (100%) rename win32/{dist => gtksharp}/bin/pangosharpglue-2.dll (100%) rename win32/{dist => gtksharp}/bin/zlib1.dll (100%) rename win32/{dist => gtksharp}/etc/gtk-2.0/gdk-pixbuf.loaders (100%) rename win32/{dist => gtksharp}/etc/gtk-2.0/gtk.immodules (100%) rename win32/{dist => gtksharp}/etc/gtk-2.0/gtkrc (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/engines/libpixmap.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/engines/libsvg.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/engines/libwimp.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll (100%) rename win32/{dist => gtksharp}/lib/gtk-2.0/include/gdkconfig.h (100%) rename win32/{dist => gtksharp}/share/themes/Default/gtkrc (100%) rename win32/{dist => gtksharp}/share/themes/MS-Windows/gtk-2.0/gtkrc (100%) diff --git a/ThePimp/Makefile.am b/ThePimp/Makefile.am index 411a8f5..a6e37ea 100644 --- a/ThePimp/Makefile.am +++ b/ThePimp/Makefile.am @@ -37,11 +37,11 @@ if USE_GTKSHARP pimp_flags = -pkg:gtk-sharp-2.0 -r:Mono.Posix else pimp_flags = \ - -r:$(top_srcdir)/win32/dist/bin/pango-sharp.dll \ - -r:$(top_srcdir)/win32/dist/bin/atk-sharp.dll \ - -r:$(top_srcdir)/win32/dist/bin/gdk-sharp.dll \ - -r:$(top_srcdir)/win32/dist/bin/gtk-sharp.dll \ - -r:$(top_srcdir)/win32/dist/bin/glib-sharp.dll \ + -r:$(top_srcdir)/win32/gtksharp/bin/pango-sharp.dll \ + -r:$(top_srcdir)/win32/gtksharp/bin/atk-sharp.dll \ + -r:$(top_srcdir)/win32/gtksharp/bin/gdk-sharp.dll \ + -r:$(top_srcdir)/win32/gtksharp/bin/gtk-sharp.dll \ + -r:$(top_srcdir)/win32/gtksharp/bin/glib-sharp.dll \ -r:Mono.Posix endif diff --git a/ThePimp/ThePimp.csproj b/ThePimp/ThePimp.csproj index 7642661..eb18764 100644 --- a/ThePimp/ThePimp.csproj +++ b/ThePimp/ThePimp.csproj @@ -40,35 +40,35 @@ False - ..\win32\dist\bin\atk-sharp.dll + ..\win32\gtksharp\bin\atk-sharp.dll False - ..\win32\dist\bin\gdk-sharp.dll + ..\win32\gtksharp\bin\gdk-sharp.dll False - ..\win32\dist\bin\glade-sharp.dll + ..\win32\gtksharp\bin\glade-sharp.dll False - ..\win32\dist\bin\glib-sharp.dll + ..\win32\gtksharp\bin\glib-sharp.dll False - ..\win32\dist\bin\gtk-sharp.dll + ..\win32\gtksharp\bin\gtk-sharp.dll False - ..\win32\dist\bin\gtkglarea-sharp.dll + ..\win32\gtksharp\bin\gtkglarea-sharp.dll False - ..\win32\dist\bin\Mono.Posix.dll + ..\win32\gtksharp\bin\Mono.Posix.dll False - ..\win32\dist\bin\pango-sharp.dll + ..\win32\gtksharp\bin\pango-sharp.dll @@ -109,7 +109,7 @@ - + diff --git a/build-win32 b/build-win32 index cb73a0e..85fa304 100755 --- a/build-win32 +++ b/build-win32 @@ -37,7 +37,7 @@ rm -Rf "${BUILDDIR}" #i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true # Install gtk-sharp -cp -r "win32/dist/"* "${INSTALLDIR}/" +cp -r "win32/gtksharp/"* "${INSTALLDIR}/" # Install pipi-sharp mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/" diff --git a/win32/dist/bin/Mono.Posix.dll b/win32/gtksharp/bin/Mono.Posix.dll similarity index 100% rename from win32/dist/bin/Mono.Posix.dll rename to win32/gtksharp/bin/Mono.Posix.dll diff --git a/win32/dist/bin/MonoPosixHelper.dll b/win32/gtksharp/bin/MonoPosixHelper.dll similarity index 100% rename from win32/dist/bin/MonoPosixHelper.dll rename to win32/gtksharp/bin/MonoPosixHelper.dll diff --git a/win32/dist/bin/atk-sharp.dll b/win32/gtksharp/bin/atk-sharp.dll similarity index 100% rename from win32/dist/bin/atk-sharp.dll rename to win32/gtksharp/bin/atk-sharp.dll diff --git a/win32/dist/bin/freetype6.dll b/win32/gtksharp/bin/freetype6.dll similarity index 100% rename from win32/dist/bin/freetype6.dll rename to win32/gtksharp/bin/freetype6.dll diff --git a/win32/dist/bin/gdk-sharp.dll b/win32/gtksharp/bin/gdk-sharp.dll similarity index 100% rename from win32/dist/bin/gdk-sharp.dll rename to win32/gtksharp/bin/gdk-sharp.dll diff --git a/win32/dist/bin/gdksharpglue-2.dll b/win32/gtksharp/bin/gdksharpglue-2.dll similarity index 100% rename from win32/dist/bin/gdksharpglue-2.dll rename to win32/gtksharp/bin/gdksharpglue-2.dll diff --git a/win32/dist/bin/glade-sharp.dll b/win32/gtksharp/bin/glade-sharp.dll similarity index 100% rename from win32/dist/bin/glade-sharp.dll rename to win32/gtksharp/bin/glade-sharp.dll diff --git a/win32/dist/bin/gladesharpglue-2.dll b/win32/gtksharp/bin/gladesharpglue-2.dll similarity index 100% rename from win32/dist/bin/gladesharpglue-2.dll rename to win32/gtksharp/bin/gladesharpglue-2.dll diff --git a/win32/dist/bin/glib-sharp.dll b/win32/gtksharp/bin/glib-sharp.dll similarity index 100% rename from win32/dist/bin/glib-sharp.dll rename to win32/gtksharp/bin/glib-sharp.dll diff --git a/win32/dist/bin/glibsharpglue-2.dll b/win32/gtksharp/bin/glibsharpglue-2.dll similarity index 100% rename from win32/dist/bin/glibsharpglue-2.dll rename to win32/gtksharp/bin/glibsharpglue-2.dll diff --git a/win32/dist/bin/gtk-sharp.dll b/win32/gtksharp/bin/gtk-sharp.dll similarity index 100% rename from win32/dist/bin/gtk-sharp.dll rename to win32/gtksharp/bin/gtk-sharp.dll diff --git a/win32/dist/bin/gtksharpglue-2.dll b/win32/gtksharp/bin/gtksharpglue-2.dll similarity index 100% rename from win32/dist/bin/gtksharpglue-2.dll rename to win32/gtksharp/bin/gtksharpglue-2.dll diff --git a/win32/dist/bin/iconv.dll b/win32/gtksharp/bin/iconv.dll similarity index 100% rename from win32/dist/bin/iconv.dll rename to win32/gtksharp/bin/iconv.dll diff --git a/win32/dist/bin/intl.dll b/win32/gtksharp/bin/intl.dll similarity index 100% rename from win32/dist/bin/intl.dll rename to win32/gtksharp/bin/intl.dll diff --git a/win32/dist/bin/jpeg62.dll b/win32/gtksharp/bin/jpeg62.dll similarity index 100% rename from win32/dist/bin/jpeg62.dll rename to win32/gtksharp/bin/jpeg62.dll diff --git a/win32/dist/bin/libatk-1.0-0.dll b/win32/gtksharp/bin/libatk-1.0-0.dll similarity index 100% rename from win32/dist/bin/libatk-1.0-0.dll rename to win32/gtksharp/bin/libatk-1.0-0.dll diff --git a/win32/dist/bin/libcairo-2.dll b/win32/gtksharp/bin/libcairo-2.dll similarity index 100% rename from win32/dist/bin/libcairo-2.dll rename to win32/gtksharp/bin/libcairo-2.dll diff --git a/win32/dist/bin/libexpat.dll b/win32/gtksharp/bin/libexpat.dll similarity index 100% rename from win32/dist/bin/libexpat.dll rename to win32/gtksharp/bin/libexpat.dll diff --git a/win32/dist/bin/libfontconfig-1.dll b/win32/gtksharp/bin/libfontconfig-1.dll similarity index 100% rename from win32/dist/bin/libfontconfig-1.dll rename to win32/gtksharp/bin/libfontconfig-1.dll diff --git a/win32/dist/bin/libgdk-win32-2.0-0.dll b/win32/gtksharp/bin/libgdk-win32-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgdk-win32-2.0-0.dll rename to win32/gtksharp/bin/libgdk-win32-2.0-0.dll diff --git a/win32/dist/bin/libgdk_pixbuf-2.0-0.dll b/win32/gtksharp/bin/libgdk_pixbuf-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgdk_pixbuf-2.0-0.dll rename to win32/gtksharp/bin/libgdk_pixbuf-2.0-0.dll diff --git a/win32/dist/bin/libglade-2.0-0.dll b/win32/gtksharp/bin/libglade-2.0-0.dll similarity index 100% rename from win32/dist/bin/libglade-2.0-0.dll rename to win32/gtksharp/bin/libglade-2.0-0.dll diff --git a/win32/dist/bin/libglib-2.0-0.dll b/win32/gtksharp/bin/libglib-2.0-0.dll similarity index 100% rename from win32/dist/bin/libglib-2.0-0.dll rename to win32/gtksharp/bin/libglib-2.0-0.dll diff --git a/win32/dist/bin/libgmodule-2.0-0.dll b/win32/gtksharp/bin/libgmodule-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgmodule-2.0-0.dll rename to win32/gtksharp/bin/libgmodule-2.0-0.dll diff --git a/win32/dist/bin/libgobject-2.0-0.dll b/win32/gtksharp/bin/libgobject-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgobject-2.0-0.dll rename to win32/gtksharp/bin/libgobject-2.0-0.dll diff --git a/win32/dist/bin/libgthread-2.0-0.dll b/win32/gtksharp/bin/libgthread-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgthread-2.0-0.dll rename to win32/gtksharp/bin/libgthread-2.0-0.dll diff --git a/win32/dist/bin/libgtk-win32-2.0-0.dll b/win32/gtksharp/bin/libgtk-win32-2.0-0.dll similarity index 100% rename from win32/dist/bin/libgtk-win32-2.0-0.dll rename to win32/gtksharp/bin/libgtk-win32-2.0-0.dll diff --git a/win32/dist/bin/libpango-1.0-0.dll b/win32/gtksharp/bin/libpango-1.0-0.dll similarity index 100% rename from win32/dist/bin/libpango-1.0-0.dll rename to win32/gtksharp/bin/libpango-1.0-0.dll diff --git a/win32/dist/bin/libpangocairo-1.0-0.dll b/win32/gtksharp/bin/libpangocairo-1.0-0.dll similarity index 100% rename from win32/dist/bin/libpangocairo-1.0-0.dll rename to win32/gtksharp/bin/libpangocairo-1.0-0.dll diff --git a/win32/dist/bin/libpangowin32-1.0-0.dll b/win32/gtksharp/bin/libpangowin32-1.0-0.dll similarity index 100% rename from win32/dist/bin/libpangowin32-1.0-0.dll rename to win32/gtksharp/bin/libpangowin32-1.0-0.dll diff --git a/win32/dist/bin/libpixman-1-0.dll b/win32/gtksharp/bin/libpixman-1-0.dll similarity index 100% rename from win32/dist/bin/libpixman-1-0.dll rename to win32/gtksharp/bin/libpixman-1-0.dll diff --git a/win32/dist/bin/libpng13.dll b/win32/gtksharp/bin/libpng13.dll similarity index 100% rename from win32/dist/bin/libpng13.dll rename to win32/gtksharp/bin/libpng13.dll diff --git a/win32/dist/bin/librsvg-2-2.dll b/win32/gtksharp/bin/librsvg-2-2.dll similarity index 100% rename from win32/dist/bin/librsvg-2-2.dll rename to win32/gtksharp/bin/librsvg-2-2.dll diff --git a/win32/dist/bin/libtiff3.dll b/win32/gtksharp/bin/libtiff3.dll similarity index 100% rename from win32/dist/bin/libtiff3.dll rename to win32/gtksharp/bin/libtiff3.dll diff --git a/win32/dist/bin/libxml2.dll b/win32/gtksharp/bin/libxml2.dll similarity index 100% rename from win32/dist/bin/libxml2.dll rename to win32/gtksharp/bin/libxml2.dll diff --git a/win32/dist/bin/pango-sharp.dll b/win32/gtksharp/bin/pango-sharp.dll similarity index 100% rename from win32/dist/bin/pango-sharp.dll rename to win32/gtksharp/bin/pango-sharp.dll diff --git a/win32/dist/bin/pangosharpglue-2.dll b/win32/gtksharp/bin/pangosharpglue-2.dll similarity index 100% rename from win32/dist/bin/pangosharpglue-2.dll rename to win32/gtksharp/bin/pangosharpglue-2.dll diff --git a/win32/dist/bin/zlib1.dll b/win32/gtksharp/bin/zlib1.dll similarity index 100% rename from win32/dist/bin/zlib1.dll rename to win32/gtksharp/bin/zlib1.dll diff --git a/win32/dist/etc/gtk-2.0/gdk-pixbuf.loaders b/win32/gtksharp/etc/gtk-2.0/gdk-pixbuf.loaders similarity index 100% rename from win32/dist/etc/gtk-2.0/gdk-pixbuf.loaders rename to win32/gtksharp/etc/gtk-2.0/gdk-pixbuf.loaders diff --git a/win32/dist/etc/gtk-2.0/gtk.immodules b/win32/gtksharp/etc/gtk-2.0/gtk.immodules similarity index 100% rename from win32/dist/etc/gtk-2.0/gtk.immodules rename to win32/gtksharp/etc/gtk-2.0/gtk.immodules diff --git a/win32/dist/etc/gtk-2.0/gtkrc b/win32/gtksharp/etc/gtk-2.0/gtkrc similarity index 100% rename from win32/dist/etc/gtk-2.0/gtkrc rename to win32/gtksharp/etc/gtk-2.0/gtkrc diff --git a/win32/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libpixmap.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/engines/libpixmap.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libpixmap.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libsvg.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/engines/libsvg.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libsvg.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libwimp.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/engines/libwimp.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/engines/libwimp.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll diff --git a/win32/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll b/win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll similarity index 100% rename from win32/dist/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll rename to win32/gtksharp/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll diff --git a/win32/dist/lib/gtk-2.0/include/gdkconfig.h b/win32/gtksharp/lib/gtk-2.0/include/gdkconfig.h similarity index 100% rename from win32/dist/lib/gtk-2.0/include/gdkconfig.h rename to win32/gtksharp/lib/gtk-2.0/include/gdkconfig.h diff --git a/win32/dist/share/themes/Default/gtkrc b/win32/gtksharp/share/themes/Default/gtkrc similarity index 100% rename from win32/dist/share/themes/Default/gtkrc rename to win32/gtksharp/share/themes/Default/gtkrc diff --git a/win32/dist/share/themes/MS-Windows/gtk-2.0/gtkrc b/win32/gtksharp/share/themes/MS-Windows/gtk-2.0/gtkrc similarity index 100% rename from win32/dist/share/themes/MS-Windows/gtk-2.0/gtkrc rename to win32/gtksharp/share/themes/MS-Windows/gtk-2.0/gtkrc