prepared for building static 0.5-beta1

13 files changed, 1708 insertions, 31 deletions

diff --git a/PORTABLE_BUILD b/PORTABLE_BUILD
index 0cfbf088..d00491fd 100644
--- a/PORTABLE_BUILD
+++ b/PORTABLE_BUILD
@@ -1 +1 @@
-2
+1
diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION
index d64531f1..672655e9 100644
--- a/PORTABLE_VERSION
+++ b/PORTABLE_VERSION
@@ -1 +1 @@
-devel
+0.5.0-beta1
diff --git a/configure.ac b/configure.ac
index 790e4390..09942782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ AC_SUBST(ZLIB_LIBS)
 
 if test "x$enable_staticlink" != "xno" ; then
     HAVE_ZIP=yes
-    ZIP_LIBS="../../$LIB/libzip.a"
+    ZIP_LIBS="../../$LIB/libzip.a ../../$LIB/libz.a"
 else
     AC_CHECK_LIB([zip], [main], [HAVE_ZIP=yes])
     ZIP_LIBS="-lzip"
@@ -168,8 +168,26 @@ else
 fi
 fi
 
+if test "x$enable_staticlink" != "xno" ; then
+    HAVE_DBUS=yes
+    DBUS_DEPS_LIBS="../../$LIB/libdbus-1.a ../../$LIB/libexpat.a -lrt"
+    DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1"
+    AC_SUBST(DBUS_DEPS_LIBS)
+else
+    PKG_CHECK_MODULES(DBUS_DEPS, dbus-1, HAVE_DBUS=yes, HAVE_DBUS=no)
+fi
+
 if test "x$enable_pulse" != "xno" ; then
-    PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+    if test "x$enable_staticlink" != "xno" ; then
+dnl ../../$LIB/libpulsecore-0.9.22.a ../../$LIB/libpulsecommon-0.9.22.a 
+dnl ../../$LIB/libpulsedsp.a 
+
+        PULSE_DEPS_LIBS="../../$LIB/libpulse-simple.a ../../$LIB/libpulse.a $DBUS_DEPS_LIBS"
+        AC_SUBST(PULSE_DEPS_LIBS)
+        HAVE_PULSE=yes
+    else
+        PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+    fi
 fi
 
 AC_CHECK_HEADER([iconv.h],[],[iconv.h not found.])
@@ -197,15 +215,6 @@ else
     AC_SUBST(CURL_LIBS)
 fi
 
-if test "x$enable_staticlink" != "xno" ; then
-    HAVE_DBUS=yes
-    DBUS_DEPS_LIBS="../../$LIB/libdbus-1.a ../../$LIB/libexpat.a -lrt"
-    DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1"
-    AC_SUBST(DBUS_DEPS_LIBS)
-else
-    PKG_CHECK_MODULES(DBUS_DEPS, dbus-1, HAVE_DBUS=yes, HAVE_DBUS=no)
-fi
-
 dnl mpgmad plugin
 
 if test "x$enable_mpgmad" != "xno" ; then
@@ -405,8 +414,15 @@ if test "x$enable_shellexec" != "xno" ; then
 fi
 
 if test "x$enable_artwork" != "xno" ; then
-    PKG_CHECK_MODULES(IMLIB2_DEPS, imlib2, HAVE_IMLIB2=yes, HAVE_IMLIB2=no)
-    if test "x$HAVE_CURL" = "xyes" && test "x$HAVE_VFS_CURL" = "xyes" && test "x$HAVE_IMLIB2" == "xyes" ; then
+    if test "x$enable_staticlink" != "xno" ; then
+        HAVE_IMLIB2=yes
+        IMLIB2_DEPS_LIBS="../../$LIB/libImlib2.a ../../$LIB/ft2.o"
+        AC_SUBST(IMLIB2_DEPS_LIBS)
+    else
+        PKG_CHECK_MODULES(IMLIB2_DEPS, imlib2, HAVE_IMLIB2=yes, HAVE_IMLIB2=no)
+    fi
+
+    if test "x$HAVE_VFS_CURL" = "xyes" && test "x$HAVE_IMLIB2" == "xyes" ; then
         HAVE_ARTWORK=yes
     fi
 fi
diff --git a/lib-x86-32/ft2.c b/lib-x86-32/ft2.c
new file mode 100644
index 00000000..b0428d08
--- /dev/null
+++ b/lib-x86-32/ft2.c
@@ -0,0 +1,823 @@
+// pretend that we have freetype2 linked in, for imlib2 
+int FT_Load_Glyph;
+int FT_UInt32;
+int FT_Memory;
+int FT_Alloc_Func;
+int FT_Free_Func;
+int FT_Realloc_Func;
+int FT_MemoryRec_;
+int FT_Stream;
+int FT_StreamDesc_;
+int FT_StreamDesc;
+int FT_Stream_IoFunc;
+int FT_Stream_CloseFunc;
+int FT_StreamRec_;
+int FT_Pos;
+int FT_Vector_;
+int FT_Vector;
+int FT_BBox_;
+int FT_BBox;
+int FT_Bitmap_;
+int FT_Bitmap;
+int FT_Outline_;
+int FT_Outline;
+int FT_Glyph_Format_;
+int FT_Glyph_Format;
+int FT_String;
+int FT_Short;
+int FT_UShort;
+int FT_Int;
+int FT_UInt;
+int FT_Long;
+int FT_Fixed;
+int FT_Generic_Finalizer;
+int FT_Generic_;
+int FT_Generic;
+int FT_ListNode;
+int FT_ListNodeRec_;
+int FT_ListRec_;
+int FT_ListRec;
+int FT_Glyph_Metrics_;
+int FT_Glyph_Metrics;
+int FT_Bitmap_Size_;
+int FT_Bitmap_Size;
+int FT_Library;
+int FT_Driver;
+int FT_Face;
+int FT_Size;
+int FT_GlyphSlot;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_Encoding;
+int FT_CharMapRec_;
+int FT_Face_Internal;
+int FT_FaceRec_;
+int FT_Size_Internal;
+int FT_Size_Metrics_;
+int FT_Size_Metrics;
+int FT_SizeRec_;
+int FT_SubGlyph;
+int FT_Slot_Internal;
+int FT_GlyphSlotRec_;
+int FT_Glyph_Metrics_;
+int FT_Face_Internal;
+int FT_Generic_Finalizer;
+int FT_CharMapRec_;
+int FT_ENCODING_MS_JOHAB;
+int FT_SubGlyphRec_;
+int FT_Generic;
+int FT_Memory;
+int FT_GlyphSlotRec_;
+int FT_StreamRec_;
+int FT_Size_Metrics;
+int FT_Glyph_Format_;
+int FT_ENCODING_WANSUNG;
+int FT_Size_Metrics_;
+int FT_MemoryRec_;
+int FT_Generic_;
+int FT_BBox;
+int FT_ENCODING_APPLE_ROMAN;
+int FT_ListRec;
+int FT_GLYPH_FORMAT_NONE;
+int FT_Outline;
+int FT_Stream_CloseFunc;
+int FT_ENCODING_ADOBE_CUSTOM;
+int FT_Bitmap_Size_;
+int FT_Alloc_Func;
+int FT_ENCODING_UNICODE;
+int FT_ENCODING_MS_SYMBOL;
+int FT_Size;
+int FT_Long;
+int FT_String;
+int FT_GLYPH_FORMAT_COMPOSITE;
+int FT_GlyphSlot;
+int FT_Vector_;
+int FT_Slot_InternalRec_;
+int FT_Free_Func;
+int FT_ENCODING_BIG5;
+int FT_Encoding;
+int FT_Vector;
+int FT_SizeRec_;
+int FT_ENCODING_MS_SJIS;
+int FT_Size_InternalRec_;
+int FT_Driver;
+int FT_ENCODING_MS_GB2312;
+int FT_ENCODING_MS_WANSUNG;
+int FT_Glyph_Format;
+int FT_Pos;
+int FT_Library;
+int FT_Short;
+int FT_ENCODING_ADOBE_LATIN_1;
+int FT_ENCODING_ADOBE_STANDARD;
+int FT_Bitmap_;
+int FT_SubGlyph;
+int FT_Face_InternalRec_;
+int FT_Fixed;
+int FT_GLYPH_FORMAT_BITMAP;
+int FT_StreamDesc;
+int FT_DriverRec_;
+int FT_ENCODING_GB2312;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_ENCODING_JOHAB;
+int FT_ListNodeRec_;
+int FT_GLYPH_FORMAT_OUTLINE;
+int FT_Stream;
+int FT_ENCODING_ADOBE_EXPERT;
+int FT_ENCODING_SJIS;
+int FT_Outline_;
+int FT_ENCODING_MS_BIG5;
+int FT_ListRec_;
+int FT_Int;
+int FT_UShort;
+int FT_ListNode;
+int FT_FaceRec_;
+int FT_Face;
+int FT_Bitmap_Size;
+int FT_ENCODING_NONE;
+int FT_StreamDesc_;
+int FT_Stream_IoFunc;
+int FT_Realloc_Func;
+int FT_Bitmap;
+int FT_GLYPH_FORMAT_PLOTTER;
+int FT_UInt;
+int FT_LibraryRec_;
+int FT_BBox_;
+int FT_UInt32;
+int FT_Slot_Internal;
+int FT_Glyph_Metrics;
+int FT_ENCODING_OLD_LATIN_2;
+int FT_Size_Internal;
+int FT_Memory;
+int FT_Alloc_Func;
+int FT_Free_Func;
+int FT_Realloc_Func;
+int FT_MemoryRec_;
+int FT_Stream;
+int FT_StreamDesc_;
+int FT_StreamDesc;
+int FT_Stream_IoFunc;
+int FT_Stream_CloseFunc;
+int FT_StreamRec_;
+int FT_Pos;
+int FT_Vector_;
+int FT_Vector;
+int FT_BBox_;
+int FT_BBox;
+int FT_Pixel_Mode_;
+int FT_Bitmap_;
+int FT_Bitmap;
+int FT_Outline_;
+int FT_Outline;
+int FT_Glyph_Format_;
+int FT_Glyph_Format;
+int FT_String;
+int FT_Short;
+int FT_UShort;
+int FT_Int;
+int FT_UInt;
+int FT_Long;
+int FT_Fixed;
+int FT_Error;
+int FT_Generic_Finalizer;
+int FT_Generic_;
+int FT_Generic;
+int FT_ListNode;
+int FT_ListNodeRec_;
+int FT_ListRec_;
+int FT_ListRec;
+int FT_Glyph_Metrics_;
+int FT_Glyph_Metrics;
+int FT_Bitmap_Size_;
+int FT_Bitmap_Size;
+int FT_Library;
+int FT_Driver;
+int FT_Face;
+int FT_Size;
+int FT_GlyphSlot;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_Encoding;
+int FT_CharMapRec_;
+int FT_Face_Internal;
+int FT_FaceRec_;
+int FT_Size_Internal;
+int FT_Size_Metrics_;
+int FT_Size_Metrics;
+int FT_SizeRec_;
+int FT_SubGlyph;
+int FT_Slot_Internal;
+int FT_GlyphSlotRec_;
+int FT_Render_Mode_;
+int FT_Kerning_Mode_;
+int FT_Glyph_Class;
+int FT_Glyph;
+int FT_GlyphRec_;
+int FT_GlyphRec;
+int FT_BitmapGlyph;
+int FT_BitmapGlyphRec_;
+int FT_ENCODING_APPLE_ROMAN;
+int FT_Face_Internal;
+int FT_ENCODING_ADOBE_EXPERT;
+int FT_PIXEL_MODE_MAX;
+int FT_RENDER_MODE_LCD;
+int FT_BitmapGlyph;
+int FT_PIXEL_MODE_MONO;
+int FT_StreamRec_;
+int FT_Face_InternalRec_;
+int FT_Glyph_Class_;
+int FT_SubGlyph;
+int FT_DriverRec_;
+int FT_Glyph_Format_;
+int FT_ENCODING_MS_BIG5;
+int FT_ENCODING_NONE;
+int FT_UShort;
+int FT_Generic;
+int FT_Memory;
+int FT_ENCODING_UNICODE;
+int FT_KERNING_DEFAULT;
+int FT_Bitmap;
+int FT_PIXEL_MODE_LCD_V;
+int FT_Vector_;
+int FT_Glyph_Metrics_;
+int FT_RENDER_MODE_MAX;
+int FT_PIXEL_MODE_GRAY;
+int FT_GlyphRec;
+int FT_Generic_Finalizer;
+int FT_ENCODING_JOHAB;
+int FT_ListRec_;
+int FT_Stream;
+int FT_Stream_IoFunc;
+int FT_Int;
+int FT_ListNodeRec_;
+int FT_ListNode;
+int FT_BBox_;
+int FT_PIXEL_MODE_NONE;
+int FT_SizeRec_;
+int FT_ENCODING_ADOBE_STANDARD;
+int FT_Vector;
+int FT_Kerning_Mode_;
+int FT_ENCODING_MS_SYMBOL;
+int FT_RENDER_MODE_LIGHT;
+int FT_Error;
+int FT_PIXEL_MODE_GRAY2;
+int FT_PIXEL_MODE_GRAY4;
+int FT_ListRec;
+int FT_CharMapRec_;
+int FT_Encoding_;
+int FT_Generic_;
+int FT_GlyphRec_;
+int FT_GLYPH_FORMAT_BITMAP;
+int FT_Size;
+int FT_Size_Metrics;
+int FT_String;
+int FT_ENCODING_MS_WANSUNG;
+int FT_Library;
+int FT_Glyph;
+int FT_ENCODING_SJIS;
+int FT_KERNING_UNFITTED;
+int FT_RENDER_MODE_LCD_V;
+int FT_Face;
+int FT_StreamDesc;
+int FT_KERNING_UNSCALED;
+int FT_SubGlyphRec_;
+int FT_Fixed;
+int FT_FaceRec_;
+int FT_LibraryRec_;
+int FT_Size_InternalRec_;
+int FT_Glyph_Format;
+int FT_GLYPH_FORMAT_OUTLINE;
+int FT_ENCODING_MS_GB2312;
+int FT_Bitmap_;
+int FT_Size_Metrics_;
+int FT_ENCODING_ADOBE_CUSTOM;
+int FT_Encoding;
+int FT_ENCODING_MS_JOHAB;
+int FT_Glyph_Metrics;
+int FT_UInt;
+int FT_Bitmap_Size_;
+int FT_GLYPH_FORMAT_COMPOSITE;
+int FT_BBox;
+int FT_CharMap;
+int FT_Short;
+int FT_Size_Internal;
+int FT_MemoryRec_;
+int FT_Pos;
+int FT_ENCODING_BIG5;
+int FT_GLYPH_FORMAT_NONE;
+int FT_Outline_;
+int FT_ENCODING_GB2312;
+int FT_GlyphSlot;
+int FT_ENCODING_ADOBE_LATIN_1;
+int FT_Stream_CloseFunc;
+int FT_ENCODING_WANSUNG;
+int FT_Alloc_Func;
+int FT_Bitmap_Size;
+int FT_RENDER_MODE_MONO;
+int FT_StreamDesc_;
+int FT_GLYPH_FORMAT_PLOTTER;
+int FT_Long;
+int FT_Slot_Internal;
+int FT_Free_Func;
+int FT_PIXEL_MODE_LCD;
+int FT_Slot_InternalRec_;
+int FT_Driver;
+int FT_Render_Mode_;
+int FT_Glyph_Class;
+int FT_ENCODING_OLD_LATIN_2;
+int FT_Outline;
+int FT_BitmapGlyphRec_;
+int FT_RENDER_MODE_NORMAL;
+int FT_ENCODING_MS_SJIS;
+int FT_Pixel_Mode_;
+int FT_GlyphSlotRec_;
+int FT_Realloc_Func;
+int FT_Load_Glyph;
+int FT_Get_Glyph;
+int FT_Glyph_To_Bitmap;
+int FT_Done_Glyph;
+int FT_Get_Char_Index;
+int FT_Get_Kerning;
+int FT_UInt32;
+int FT_Memory;
+int FT_Alloc_Func;
+int FT_Free_Func;
+int FT_Realloc_Func;
+int FT_MemoryRec_;
+int FT_Stream;
+int FT_StreamDesc_;
+int FT_StreamDesc;
+int FT_Stream_IoFunc;
+int FT_Stream_CloseFunc;
+int FT_StreamRec_;
+int FT_Pos;
+int FT_Vector_;
+int FT_Vector;
+int FT_BBox_;
+int FT_BBox;
+int FT_Bitmap_;
+int FT_Bitmap;
+int FT_Outline_;
+int FT_Outline;
+int FT_Glyph_Format_;
+int FT_Glyph_Format;
+int FT_String;
+int FT_Short;
+int FT_UShort;
+int FT_Int;
+int FT_UInt;
+int FT_Long;
+int FT_Fixed;
+int FT_Error;
+int FT_Generic_Finalizer;
+int FT_Generic_;
+int FT_Generic;
+int FT_ListNode;
+int FT_ListNodeRec_;
+int FT_ListRec_;
+int FT_ListRec;
+int FT_Glyph_Metrics_;
+int FT_Glyph_Metrics;
+int FT_Bitmap_Size_;
+int FT_Bitmap_Size;
+int FT_Library;
+int FT_Driver;
+int FT_Face;
+int FT_Size;
+int FT_GlyphSlot;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_Encoding;
+int FT_CharMapRec_;
+int FT_Face_Internal;
+int FT_FaceRec_;
+int FT_Size_Internal;
+int FT_Size_Metrics_;
+int FT_Size_Metrics;
+int FT_SizeRec_;
+int FT_SubGlyph;
+int FT_Slot_Internal;
+int FT_GlyphSlotRec_;
+int FT_Glyph_Class;
+int FT_Glyph;
+int FT_GlyphRec_;
+int FT_GlyphRec;
+int FT_BitmapGlyph;
+int FT_BitmapGlyphRec_;
+int FT_ENCODING_APPLE_ROMAN;
+int FT_Face_Internal;
+int FT_ENCODING_ADOBE_EXPERT;
+int FT_BitmapGlyph;
+int FT_StreamRec_;
+int FT_Face_InternalRec_;
+int FT_Glyph_Class_;
+int FT_Size_InternalRec_;
+int FT_SubGlyph;
+int FT_DriverRec_;
+int FT_Glyph_Format_;
+int FT_ENCODING_MS_BIG5;
+int FT_ENCODING_NONE;
+int FT_UShort;
+int FT_Generic;
+int FT_Memory;
+int FT_ENCODING_UNICODE;
+int FT_Bitmap;
+int FT_Vector_;
+int FT_Glyph_Metrics_;
+int FT_GlyphRec;
+int FT_Generic_Finalizer;
+int FT_ENCODING_JOHAB;
+int FT_LibraryRec_;
+int FT_ListRec_;
+int FT_Stream;
+int FT_Stream_IoFunc;
+int FT_Int;
+int FT_ListNodeRec_;
+int FT_ListNode;
+int FT_BBox_;
+int FT_SizeRec_;
+int FT_ENCODING_ADOBE_STANDARD;
+int FT_Vector;
+int FT_ENCODING_MS_SYMBOL;
+int FT_Error;
+int FT_ListRec;
+int FT_CharMapRec_;
+int FT_Encoding_;
+int FT_Generic_;
+int FT_GlyphRec_;
+int FT_GLYPH_FORMAT_BITMAP;
+int FT_Size;
+int FT_Size_Metrics;
+int FT_String;
+int FT_ENCODING_MS_WANSUNG;
+int FT_Library;
+int FT_Glyph;
+int FT_ENCODING_SJIS;
+int FT_Face;
+int FT_StreamDesc;
+int FT_SubGlyphRec_;
+int FT_Fixed;
+int FT_FaceRec_;
+int FT_Glyph_Format;
+int FT_GLYPH_FORMAT_OUTLINE;
+int FT_ENCODING_MS_GB2312;
+int FT_Bitmap_;
+int FT_Size_Metrics_;
+int FT_ENCODING_ADOBE_CUSTOM;
+int FT_Encoding;
+int FT_ENCODING_MS_JOHAB;
+int FT_UInt32;
+int FT_Glyph_Metrics;
+int FT_UInt;
+int FT_Bitmap_Size_;
+int FT_GLYPH_FORMAT_COMPOSITE;
+int FT_BBox;
+int FT_CharMap;
+int FT_Short;
+int FT_Size_Internal;
+int FT_MemoryRec_;
+int FT_Pos;
+int FT_ENCODING_BIG5;
+int FT_GLYPH_FORMAT_NONE;
+int FT_Outline_;
+int FT_ENCODING_GB2312;
+int FT_GlyphSlot;
+int FT_ENCODING_ADOBE_LATIN_1;
+int FT_Stream_CloseFunc;
+int FT_ENCODING_WANSUNG;
+int FT_Alloc_Func;
+int FT_Bitmap_Size;
+int FT_StreamDesc_;
+int FT_GLYPH_FORMAT_PLOTTER;
+int FT_Long;
+int FT_Slot_Internal;
+int FT_Free_Func;
+int FT_Slot_InternalRec_;
+int FT_Driver;
+int FT_Glyph_Class;
+int FT_ENCODING_OLD_LATIN_2;
+int FT_Outline;
+int FT_BitmapGlyphRec_;
+int FT_ENCODING_MS_SJIS;
+int FT_GlyphSlotRec_;
+int FT_Realloc_Func;
+int FT_Done_Glyph;
+int FT_Done_Face;
+int FT_New_Face;
+int FT_Set_Char_Size;
+int FT_Select_Charmap;
+int FT_Set_Pixel_Sizes;
+int FT_UInt32;
+int FT_Memory;
+int FT_Alloc_Func;
+int FT_Free_Func;
+int FT_Realloc_Func;
+int FT_MemoryRec_;
+int FT_Stream;
+int FT_StreamDesc_;
+int FT_StreamDesc;
+int FT_Stream_IoFunc;
+int FT_Stream_CloseFunc;
+int FT_StreamRec_;
+int FT_Pos;
+int FT_Vector_;
+int FT_Vector;
+int FT_BBox_;
+int FT_BBox;
+int FT_Bitmap_;
+int FT_Bitmap;
+int FT_Outline_;
+int FT_Outline;
+int FT_Glyph_Format_;
+int FT_Glyph_Format;
+int FT_String;
+int FT_Short;
+int FT_UShort;
+int FT_Int;
+int FT_UInt;
+int FT_Long;
+int FT_Fixed;
+int FT_Generic_Finalizer;
+int FT_Generic_;
+int FT_Generic;
+int FT_ListNode;
+int FT_ListNodeRec_;
+int FT_ListRec_;
+int FT_ListRec;
+int FT_Glyph_Metrics_;
+int FT_Glyph_Metrics;
+int FT_Bitmap_Size_;
+int FT_Bitmap_Size;
+int FT_Library;
+int FT_Driver;
+int FT_Face;
+int FT_Size;
+int FT_GlyphSlot;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_Encoding;
+int FT_CharMapRec_;
+int FT_Face_Internal;
+int FT_FaceRec_;
+int FT_Size_Internal;
+int FT_Size_Metrics_;
+int FT_Size_Metrics;
+int FT_SizeRec_;
+int FT_SubGlyph;
+int FT_Slot_Internal;
+int FT_GlyphSlotRec_;
+int FT_ENCODING_APPLE_ROMAN;
+int FT_Face_Internal;
+int FT_ENCODING_ADOBE_EXPERT;
+int FT_StreamRec_;
+int FT_Face_InternalRec_;
+int FT_Size_InternalRec_;
+int FT_SubGlyph;
+int FT_DriverRec_;
+int FT_Glyph_Format_;
+int FT_ENCODING_MS_BIG5;
+int FT_ENCODING_NONE;
+int FT_UShort;
+int FT_Generic;
+int FT_Memory;
+int FT_ENCODING_UNICODE;
+int FT_Bitmap;
+int FT_Vector_;
+int FT_Glyph_Metrics_;
+int FT_Generic_Finalizer;
+int FT_ENCODING_JOHAB;
+int FT_LibraryRec_;
+int FT_ListRec_;
+int FT_Stream;
+int FT_Stream_IoFunc;
+int FT_Int;
+int FT_ListNodeRec_;
+int FT_ListNode;
+int FT_BBox_;
+int FT_SizeRec_;
+int FT_ENCODING_ADOBE_STANDARD;
+int FT_Vector;
+int FT_ENCODING_MS_SYMBOL;
+int FT_ListRec;
+int FT_CharMapRec_;
+int FT_Encoding_;
+int FT_Generic_;
+int FT_GLYPH_FORMAT_BITMAP;
+int FT_Size;
+int FT_Size_Metrics;
+int FT_String;
+int FT_ENCODING_MS_WANSUNG;
+int FT_Library;
+int FT_ENCODING_SJIS;
+int FT_Face;
+int FT_StreamDesc;
+int FT_SubGlyphRec_;
+int FT_Fixed;
+int FT_FaceRec_;
+int FT_Glyph_Format;
+int FT_GLYPH_FORMAT_OUTLINE;
+int FT_ENCODING_MS_GB2312;
+int FT_Bitmap_;
+int FT_Size_Metrics_;
+int FT_ENCODING_ADOBE_CUSTOM;
+int FT_Encoding;
+int FT_ENCODING_MS_JOHAB;
+int FT_UInt32;
+int FT_Glyph_Metrics;
+int FT_UInt;
+int FT_Bitmap_Size_;
+int FT_GLYPH_FORMAT_COMPOSITE;
+int FT_BBox;
+int FT_CharMap;
+int FT_Short;
+int FT_Size_Internal;
+int FT_MemoryRec_;
+int FT_Pos;
+int FT_ENCODING_BIG5;
+int FT_GLYPH_FORMAT_NONE;
+int FT_Outline_;
+int FT_ENCODING_GB2312;
+int FT_GlyphSlot;
+int FT_ENCODING_ADOBE_LATIN_1;
+int FT_Stream_CloseFunc;
+int FT_ENCODING_WANSUNG;
+int FT_Alloc_Func;
+int FT_Bitmap_Size;
+int FT_StreamDesc_;
+int FT_GLYPH_FORMAT_PLOTTER;
+int FT_Long;
+int FT_Slot_Internal;
+int FT_Free_Func;
+int FT_Slot_InternalRec_;
+int FT_Driver;
+int FT_ENCODING_OLD_LATIN_2;
+int FT_Outline;
+int FT_ENCODING_MS_SJIS;
+int FT_GlyphSlotRec_;
+int FT_Realloc_Func;
+int FT_Init_FreeType;
+int FT_Memory;
+int FT_Alloc_Func;
+int FT_Free_Func;
+int FT_Realloc_Func;
+int FT_MemoryRec_;
+int FT_Stream;
+int FT_StreamDesc_;
+int FT_StreamDesc;
+int FT_Stream_IoFunc;
+int FT_Stream_CloseFunc;
+int FT_StreamRec_;
+int FT_Pos;
+int FT_Vector_;
+int FT_Vector;
+int FT_BBox_;
+int FT_BBox;
+int FT_Bitmap_;
+int FT_Bitmap;
+int FT_Outline_;
+int FT_Outline;
+int FT_Glyph_Format_;
+int FT_Glyph_Format;
+int FT_String;
+int FT_Short;
+int FT_UShort;
+int FT_Int;
+int FT_UInt;
+int FT_Long;
+int FT_Fixed;
+int FT_Generic_Finalizer;
+int FT_Generic_;
+int FT_Generic;
+int FT_ListNode;
+int FT_ListNodeRec_;
+int FT_ListRec_;
+int FT_ListRec;
+int FT_Glyph_Metrics_;
+int FT_Glyph_Metrics;
+int FT_Bitmap_Size_;
+int FT_Bitmap_Size;
+int FT_Library;
+int FT_Driver;
+int FT_Face;
+int FT_Size;
+int FT_GlyphSlot;
+int FT_CharMap;
+int FT_Encoding_;
+int FT_Encoding;
+int FT_CharMapRec_;
+int FT_Face_Internal;
+int FT_FaceRec_;
+int FT_Size_Internal;
+int FT_Size_Metrics_;
+int FT_Size_Metrics;
+int FT_SizeRec_;
+int FT_SubGlyph;
+int FT_Slot_Internal;
+int FT_GlyphSlotRec_;
+int FT_Kerning_Mode_;
+int FT_Glyph_Class;
+int FT_Glyph;
+int FT_GlyphRec_;
+int FT_GlyphRec;
+int FT_BitmapGlyph;
+int FT_BitmapGlyphRec_;
+int FT_ENCODING_APPLE_ROMAN;
+int FT_Face_Internal;
+int FT_ENCODING_ADOBE_EXPERT;
+int FT_BitmapGlyph;
+int FT_StreamRec_;
+int FT_Face_InternalRec_;
+int FT_Glyph_Class_;
+int FT_Size_InternalRec_;
+int FT_SubGlyph;
+int FT_DriverRec_;
+int FT_Glyph_Format_;
+int FT_ENCODING_MS_BIG5;
+int FT_ENCODING_NONE;
+int FT_UShort;
+int FT_Generic;
+int FT_Memory;
+int FT_ENCODING_UNICODE;
+int FT_KERNING_DEFAULT;
+int FT_Bitmap;
+int FT_Vector_;
+int FT_Glyph_Metrics_;
+int FT_GlyphRec;
+int FT_Generic_Finalizer;
+int FT_ENCODING_JOHAB;
+int FT_LibraryRec_;
+int FT_ListRec_;
+int FT_Stream;
+int FT_Stream_IoFunc;
+int FT_Int;
+int FT_ListNodeRec_;
+int FT_ListNode;
+int FT_BBox_;
+int FT_SizeRec_;
+int FT_ENCODING_ADOBE_STANDARD;
+int FT_Vector;
+int FT_Kerning_Mode_;
+int FT_ENCODING_MS_SYMBOL;
+int FT_ListRec;
+int FT_CharMapRec_;
+int FT_Encoding_;
+int FT_Generic_;
+int FT_GlyphRec_;
+int FT_GLYPH_FORMAT_BITMAP;
+int FT_Size;
+int FT_Size_Metrics;
+int FT_String;
+int FT_ENCODING_MS_WANSUNG;
+int FT_Library;
+int FT_Glyph;
+int FT_ENCODING_SJIS;
+int FT_KERNING_UNFITTED;
+int FT_KERNING_UNSCALED;
+int FT_Face;
+int FT_StreamDesc;
+int FT_SubGlyphRec_;
+int FT_Fixed;
+int FT_FaceRec_;
+int FT_Glyph_Format;
+int FT_GLYPH_FORMAT_OUTLINE;
+int FT_ENCODING_MS_GB2312;
+int FT_Bitmap_;
+int FT_Size_Metrics_;
+int FT_ENCODING_ADOBE_CUSTOM;
+int FT_Encoding;
+int FT_ENCODING_MS_JOHAB;
+int FT_Glyph_Metrics;
+int FT_UInt;
+int FT_Bitmap_Size_;
+int FT_GLYPH_FORMAT_COMPOSITE;
+int FT_BBox;
+int FT_CharMap;
+int FT_Short;
+int FT_Size_Internal;
+int FT_MemoryRec_;
+int FT_Pos;
+int FT_ENCODING_BIG5;
+int FT_GLYPH_FORMAT_NONE;
+int FT_Outline_;
+int FT_ENCODING_GB2312;
+int FT_GlyphSlot;
+int FT_ENCODING_ADOBE_LATIN_1;
+int FT_Stream_CloseFunc;
+int FT_ENCODING_WANSUNG;
+int FT_Alloc_Func;
+int FT_Bitmap_Size;
+int FT_StreamDesc_;
+int FT_GLYPH_FORMAT_PLOTTER;
+int FT_Long;
+int FT_Slot_Internal;
+int FT_Free_Func;
+int FT_Slot_InternalRec_;
+int FT_Driver;
+int FT_Glyph_Class;
+int FT_ENCODING_OLD_LATIN_2;
+int FT_Outline;
+int FT_BitmapGlyphRec_;
+int FT_ENCODING_MS_SJIS;
+int FT_GlyphSlotRec_;
+int FT_Realloc_Func;
+int FT_Get_Kerning;
diff --git a/lib-x86-32/ft2.o b/lib-x86-32/ft2.o
new file mode 100644
index 00000000..2ce18485
--- /dev/null
+++ b/lib-x86-32/ft2.o
diff --git a/lib-x86-32/include/Imlib2.h b/lib-x86-32/include/Imlib2.h
new file mode 100644
index 00000000..554ae9bb
--- /dev/null
+++ b/lib-x86-32/include/Imlib2.h
@@ -0,0 +1,513 @@
+#ifndef __IMLIB_API_H
+# define __IMLIB_API_H 1
+
+# ifdef EAPI
+# undef EAPI
+# endif
+# ifdef WIN32
+#  ifdef BUILDING_DLL
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI __declspec(dllimport)
+#  endif
+# else
+#  ifdef __GNUC__
+#   if __GNUC__ >= 4
+#    define EAPI __attribute__ ((visibility("default")))
+#   else
+#    define EAPI
+#   endif
+#  else
+#   define EAPI
+#  endif
+# endif
+
+# ifndef X_DISPLAY_MISSING
+#  include <X11/Xlib.h>
+# endif
+
+/* Data types to use */
+# ifndef DATA64
+#  define DATA64 unsigned long long
+#  define DATA32 unsigned int
+#  define DATA16 unsigned short
+#  define DATA8  unsigned char
+# endif
+
+/* opaque data types */
+typedef void *Imlib_Context;
+typedef void *Imlib_Image;
+typedef void *Imlib_Color_Modifier;
+typedef void *Imlib_Updates;
+typedef void *Imlib_Font;
+typedef void *Imlib_Color_Range;
+typedef void *Imlib_Filter;
+typedef struct _imlib_border Imlib_Border;
+typedef struct _imlib_color Imlib_Color;
+typedef void *ImlibPolygon;
+
+/* blending operations */
+enum _imlib_operation
+{
+   IMLIB_OP_COPY,
+   IMLIB_OP_ADD,
+   IMLIB_OP_SUBTRACT,
+   IMLIB_OP_RESHADE
+};
+
+enum _imlib_text_direction
+{
+   IMLIB_TEXT_TO_RIGHT = 0,
+   IMLIB_TEXT_TO_LEFT = 1,
+   IMLIB_TEXT_TO_DOWN = 2,
+   IMLIB_TEXT_TO_UP = 3,
+   IMLIB_TEXT_TO_ANGLE = 4
+};
+
+enum _imlib_load_error
+{
+   IMLIB_LOAD_ERROR_NONE,
+   IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST,
+   IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY,
+   IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ,
+   IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT,
+   IMLIB_LOAD_ERROR_PATH_TOO_LONG,
+   IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT,
+   IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY,
+   IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE,
+   IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS,
+   IMLIB_LOAD_ERROR_OUT_OF_MEMORY,
+   IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS,
+   IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE,
+   IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE,
+   IMLIB_LOAD_ERROR_UNKNOWN
+};
+
+/* Encodings known to Imlib2 (so far) */
+enum _imlib_TTF_encoding
+{
+   IMLIB_TTF_ENCODING_ISO_8859_1,
+   IMLIB_TTF_ENCODING_ISO_8859_2,
+   IMLIB_TTF_ENCODING_ISO_8859_3,
+   IMLIB_TTF_ENCODING_ISO_8859_4,
+   IMLIB_TTF_ENCODING_ISO_8859_5
+};
+
+typedef enum _imlib_operation Imlib_Operation;
+typedef enum _imlib_load_error Imlib_Load_Error;
+typedef enum _imlib_load_error ImlibLoadError;
+typedef enum _imlib_text_direction Imlib_Text_Direction;
+typedef enum _imlib_TTF_encoding Imlib_TTF_Encoding;
+
+struct _imlib_border
+{
+   int left, right, top, bottom;
+};
+
+struct _imlib_color
+{
+   int alpha, red, green, blue;
+};
+
+/* Progressive loading callbacks */
+typedef int (*Imlib_Progress_Function) (Imlib_Image im, char percent,
+                                        int update_x, int update_y,
+                                        int update_w, int update_h);
+typedef void (*Imlib_Data_Destructor_Function) (Imlib_Image im, void *data);
+
+# ifdef __cplusplus
+extern "C"
+{
+# endif
+
+/* context handling */
+   EAPI Imlib_Context imlib_context_new(void);
+   EAPI void imlib_context_free(Imlib_Context context);
+
+   EAPI void imlib_context_push(Imlib_Context context);
+   EAPI void imlib_context_pop(void);
+   EAPI Imlib_Context imlib_context_get(void);
+
+/* context setting */
+# ifndef X_DISPLAY_MISSING
+   EAPI void imlib_context_set_display(Display * display);
+   EAPI void imlib_context_disconnect_display(void);
+   EAPI void imlib_context_set_visual(Visual * visual);
+   EAPI void imlib_context_set_colormap(Colormap colormap);
+   EAPI void imlib_context_set_drawable(Drawable drawable);
+   EAPI void imlib_context_set_mask(Pixmap mask);
+# endif
+   EAPI void imlib_context_set_dither_mask(char dither_mask);
+   EAPI void imlib_context_set_mask_alpha_threshold(int mask_alpha_threshold);
+   EAPI void imlib_context_set_anti_alias(char anti_alias);
+   EAPI void imlib_context_set_dither(char dither);
+   EAPI void imlib_context_set_blend(char blend);
+   EAPI void imlib_context_set_color_modifier(Imlib_Color_Modifier color_modifier);
+   EAPI void imlib_context_set_operation(Imlib_Operation operation);
+   EAPI void imlib_context_set_font(Imlib_Font font);
+   EAPI void imlib_context_set_direction(Imlib_Text_Direction direction);
+   EAPI void imlib_context_set_angle(double angle);
+   EAPI void imlib_context_set_color(int red, int green, int blue, int alpha);
+   EAPI void imlib_context_set_color_hsva(float hue, float saturation, float value, int alpha);
+   EAPI void imlib_context_set_color_hlsa(float hue, float lightness, float saturation, int alpha);
+   EAPI void imlib_context_set_color_cmya(int cyan, int magenta, int yellow, int alpha);
+   EAPI void imlib_context_set_color_range(Imlib_Color_Range color_range);
+   EAPI void imlib_context_set_progress_function(Imlib_Progress_Function
+                                                 progress_function);
+   EAPI void imlib_context_set_progress_granularity(char progress_granularity);
+   EAPI void imlib_context_set_image(Imlib_Image image);
+   EAPI void imlib_context_set_cliprect(int x, int y, int w, int h);
+   EAPI void imlib_context_set_TTF_encoding(Imlib_TTF_Encoding encoding);
+
+/* context getting */
+# ifndef X_DISPLAY_MISSING
+   EAPI Display *imlib_context_get_display(void);
+   EAPI Visual *imlib_context_get_visual(void);
+   EAPI Colormap imlib_context_get_colormap(void);
+   EAPI Drawable imlib_context_get_drawable(void);
+   EAPI Pixmap imlib_context_get_mask(void);
+# endif
+   EAPI char imlib_context_get_dither_mask(void);
+   EAPI char imlib_context_get_anti_alias(void);
+   EAPI int imlib_context_get_mask_alpha_threshold(void);
+   EAPI char imlib_context_get_dither(void);
+   EAPI char imlib_context_get_blend(void);
+   EAPI Imlib_Color_Modifier imlib_context_get_color_modifier(void);
+   EAPI Imlib_Operation imlib_context_get_operation(void);
+   EAPI Imlib_Font imlib_context_get_font(void);
+   EAPI double imlib_context_get_angle(void);
+   EAPI Imlib_Text_Direction imlib_context_get_direction(void);
+   EAPI void imlib_context_get_color(int *red, int *green, int *blue, int *alpha);
+   EAPI void imlib_context_get_color_hsva(float *hue, float *saturation, float *value, int *alpha);
+   EAPI void imlib_context_get_color_hlsa(float *hue, float *lightness, float *saturation, int *alpha);
+   EAPI void imlib_context_get_color_cmya(int *cyan, int *magenta, int *yellow, int *alpha);
+   EAPI Imlib_Color *imlib_context_get_imlib_color(void);
+   EAPI Imlib_Color_Range imlib_context_get_color_range(void);
+   EAPI Imlib_Progress_Function imlib_context_get_progress_function(void);
+   EAPI char imlib_context_get_progress_granularity(void);
+   EAPI Imlib_Image imlib_context_get_image(void);
+   EAPI void imlib_context_get_cliprect(int *x, int *y, int *w, int *h);
+   EAPI Imlib_TTF_Encoding imlib_context_get_TTF_encoding(void);
+
+   EAPI int imlib_get_cache_size(void);
+   EAPI void imlib_set_cache_size(int bytes);
+   EAPI int imlib_get_color_usage(void);
+   EAPI void imlib_set_color_usage(int max);
+   EAPI void imlib_flush_loaders(void);
+# ifndef X_DISPLAY_MISSING
+   EAPI int imlib_get_visual_depth(Display * display, Visual * visual);
+   EAPI Visual *imlib_get_best_visual(Display * display, int screen,
+                                      int *depth_return);
+# endif
+
+   EAPI Imlib_Image imlib_load_image(const char *file);
+   EAPI Imlib_Image imlib_load_image_immediately(const char *file);
+   EAPI Imlib_Image imlib_load_image_without_cache(const char *file);
+   EAPI Imlib_Image imlib_load_image_immediately_without_cache(const char *file);
+   EAPI Imlib_Image imlib_load_image_with_error_return(const char *file,
+                                                       Imlib_Load_Error *
+                                                       error_return);
+   EAPI void imlib_free_image(void);
+   EAPI void imlib_free_image_and_decache(void);
+
+/* query/modify image parameters */
+   EAPI int imlib_image_get_width(void);
+   EAPI int imlib_image_get_height(void);
+   EAPI const char *imlib_image_get_filename(void);
+   EAPI DATA32 *imlib_image_get_data(void);
+   EAPI DATA32 *imlib_image_get_data_for_reading_only(void);
+   EAPI void imlib_image_put_back_data(DATA32 * data);
+   EAPI char imlib_image_has_alpha(void);
+   EAPI void imlib_image_set_changes_on_disk(void);
+   EAPI void imlib_image_get_border(Imlib_Border * border);
+   EAPI void imlib_image_set_border(Imlib_Border * border);
+   EAPI void imlib_image_set_format(const char *format);
+   EAPI void imlib_image_set_irrelevant_format(char irrelevant);
+   EAPI void imlib_image_set_irrelevant_border(char irrelevant);
+   EAPI void imlib_image_set_irrelevant_alpha(char irrelevant);
+   EAPI char *imlib_image_format(void);
+   EAPI void imlib_image_set_has_alpha(char has_alpha);
+   EAPI void imlib_image_query_pixel(int x, int y, Imlib_Color * color_return);
+   EAPI void imlib_image_query_pixel_hsva(int x, int y, float *hue, float *saturation, float *value, int *alpha);
+   EAPI void imlib_image_query_pixel_hlsa(int x, int y, float *hue, float *lightness, float *saturation, int *alpha);
+   EAPI void imlib_image_query_pixel_cmya(int x, int y, int *cyan, int *magenta, int *yellow, int *alpha);
+
+/* rendering functions */
+# ifndef X_DISPLAY_MISSING
+   EAPI void imlib_render_pixmaps_for_whole_image(Pixmap * pixmap_return,
+                                                  Pixmap * mask_return);
+   EAPI void imlib_render_pixmaps_for_whole_image_at_size(Pixmap * pixmap_return,
+                                                          Pixmap * mask_return,
+                                                          int width, int height);
+   EAPI void imlib_free_pixmap_and_mask(Pixmap pixmap);
+   EAPI void imlib_render_image_on_drawable(int x, int y);
+   EAPI void imlib_render_image_on_drawable_at_size(int x, int y, int width,
+                                                    int height);
+   EAPI void imlib_render_image_part_on_drawable_at_size(int source_x,
+                                                         int source_y,
+                                                         int source_width,
+                                                         int source_height, int x,
+                                                         int y, int width,
+                                                         int height);
+   EAPI DATA32 imlib_render_get_pixel_color(void);
+# endif
+   EAPI void imlib_blend_image_onto_image(Imlib_Image source_image,
+                                          char merge_alpha, int source_x,
+                                          int source_y, int source_width,
+                                          int source_height, int destination_x,
+                                          int destination_y, int destination_width,
+                                          int destination_height);
+
+/* creation functions */
+   EAPI Imlib_Image imlib_create_image(int width, int height);
+   EAPI Imlib_Image imlib_create_image_using_data(int width, int height,
+                                                  DATA32 * data);
+   EAPI Imlib_Image imlib_create_image_using_copied_data(int width, int height,
+                                                         DATA32 * data);
+# ifndef X_DISPLAY_MISSING
+   EAPI Imlib_Image imlib_create_image_from_drawable(Pixmap mask, int x, int y,
+                                                     int width, int height,
+                                                     char need_to_grab_x);
+   EAPI Imlib_Image imlib_create_image_from_ximage(XImage *image, XImage *mask, int x, int y,
+                                                     int width, int height,
+                                                     char need_to_grab_x);
+   EAPI Imlib_Image imlib_create_scaled_image_from_drawable(Pixmap mask,
+                                                            int source_x,
+                                                            int source_y,
+                                                            int source_width,
+                                                            int source_height,
+                                                            int destination_width,
+                                                            int destination_height,
+                                                            char need_to_grab_x,
+                                                            char
+                                                            get_mask_from_shape);
+   EAPI char imlib_copy_drawable_to_image(Pixmap mask, int x, int y, int width,
+                                          int height, int destination_x,
+                                          int destination_y, char need_to_grab_x);
+# endif
+   EAPI Imlib_Image imlib_clone_image(void);
+   EAPI Imlib_Image imlib_create_cropped_image(int x, int y, int width,
+                                               int height);
+   EAPI Imlib_Image imlib_create_cropped_scaled_image(int source_x, int source_y,
+                                                      int source_width,
+                                                      int source_height,
+                                                      int destination_width,
+                                                      int destination_height);
+
+/* imlib updates. lists of rectangles for storing required update draws */
+   EAPI Imlib_Updates imlib_updates_clone(Imlib_Updates updates);
+   EAPI Imlib_Updates imlib_update_append_rect(Imlib_Updates updates, int x, int y,
+                                               int w, int h);
+   EAPI Imlib_Updates imlib_updates_merge(Imlib_Updates updates, int w, int h);
+   EAPI Imlib_Updates imlib_updates_merge_for_rendering(Imlib_Updates updates,
+                                                        int w, int h);
+   EAPI void imlib_updates_free(Imlib_Updates updates);
+   EAPI Imlib_Updates imlib_updates_get_next(Imlib_Updates updates);
+   EAPI void imlib_updates_get_coordinates(Imlib_Updates updates, int *x_return,
+                                           int *y_return, int *width_return,
+                                           int *height_return);
+   EAPI void imlib_updates_set_coordinates(Imlib_Updates updates, int x, int y,
+                                           int width, int height);
+   EAPI void imlib_render_image_updates_on_drawable(Imlib_Updates updates, int x,
+                                                    int y);
+   EAPI Imlib_Updates imlib_updates_init(void);
+   EAPI Imlib_Updates imlib_updates_append_updates(Imlib_Updates updates,
+                                                   Imlib_Updates appended_updates);
+
+/* image modification */
+   EAPI void imlib_image_flip_horizontal(void);
+   EAPI void imlib_image_flip_vertical(void);
+   EAPI void imlib_image_flip_diagonal(void);
+   EAPI void imlib_image_orientate(int orientation);
+   EAPI void imlib_image_blur(int radius);
+   EAPI void imlib_image_sharpen(int radius);
+   EAPI void imlib_image_tile_horizontal(void);
+   EAPI void imlib_image_tile_vertical(void);
+   EAPI void imlib_image_tile(void);
+
+/* fonts and text */
+   EAPI Imlib_Font imlib_load_font(const char *font_name);
+   EAPI void imlib_free_font(void);
+   /* NB! The four functions below are deprecated. */
+   EAPI int imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font fallback_font);
+   EAPI void imlib_remove_font_from_fallback_chain(Imlib_Font fallback_font);
+   EAPI Imlib_Font imlib_get_prev_font_in_fallback_chain(Imlib_Font fn);
+   EAPI Imlib_Font imlib_get_next_font_in_fallback_chain(Imlib_Font fn);
+   /* NB! The four functions above are deprecated. */
+   EAPI void imlib_text_draw(int x, int y, const char *text);
+   EAPI void imlib_text_draw_with_return_metrics(int x, int y, const char *text,
+                                                 int *width_return,
+                                                 int *height_return,
+                                                 int *horizontal_advance_return,
+                                                 int *vertical_advance_return);
+   EAPI void imlib_get_text_size(const char *text, int *width_return,
+                                 int *height_return);
+   EAPI void imlib_get_text_advance(const char *text, 
+			       int *horizontal_advance_return,
+			       int *vertical_advance_return);
+   EAPI int imlib_get_text_inset(const char *text);
+   EAPI void imlib_add_path_to_font_path(const char *path);
+   EAPI void imlib_remove_path_from_font_path(const char *path);
+   EAPI char **imlib_list_font_path(int *number_return);
+   EAPI int imlib_text_get_index_and_location(const char *text, int x, int y,
+                                              int *char_x_return,
+                                              int *char_y_return,
+                                              int *char_width_return,
+                                              int *char_height_return);
+   EAPI void imlib_text_get_location_at_index(const char *text, int index,
+                                              int *char_x_return,
+                                              int *char_y_return,
+                                              int *char_width_return,
+                                              int *char_height_return);
+   EAPI char **imlib_list_fonts(int *number_return);
+   EAPI void imlib_free_font_list(char **font_list, int number);
+   EAPI int imlib_get_font_cache_size(void);
+   EAPI void imlib_set_font_cache_size(int bytes);
+   EAPI void imlib_flush_font_cache(void);
+   EAPI int imlib_get_font_ascent(void);
+   EAPI int imlib_get_font_descent(void);
+   EAPI int imlib_get_maximum_font_ascent(void);
+   EAPI int imlib_get_maximum_font_descent(void);
+
+/* color modifiers */
+   EAPI Imlib_Color_Modifier imlib_create_color_modifier(void);
+   EAPI void imlib_free_color_modifier(void);
+   EAPI void imlib_modify_color_modifier_gamma(double gamma_value);
+   EAPI void imlib_modify_color_modifier_brightness(double brightness_value);
+   EAPI void imlib_modify_color_modifier_contrast(double contrast_value);
+   EAPI void imlib_set_color_modifier_tables(DATA8 * red_table,
+                                             DATA8 * green_table,
+                                             DATA8 * blue_table,
+                                             DATA8 * alpha_table);
+   EAPI void imlib_get_color_modifier_tables(DATA8 * red_table,
+                                             DATA8 * green_table,
+                                             DATA8 * blue_table,
+                                             DATA8 * alpha_table);
+   EAPI void imlib_reset_color_modifier(void);
+   EAPI void imlib_apply_color_modifier(void);
+   EAPI void imlib_apply_color_modifier_to_rectangle(int x, int y, int width,
+                                                     int height);
+
+/* drawing on images */
+   EAPI Imlib_Updates imlib_image_draw_pixel(int x, int y, char make_updates);
+   EAPI Imlib_Updates imlib_image_draw_line(int x1, int y1, int x2, int y2,
+                                            char make_updates);
+   EAPI void imlib_image_draw_rectangle(int x, int y, int width, int height);
+   EAPI void imlib_image_fill_rectangle(int x, int y, int width, int height);
+   EAPI void imlib_image_copy_alpha_to_image(Imlib_Image image_source, int x,
+                                             int y);
+   EAPI void imlib_image_copy_alpha_rectangle_to_image(Imlib_Image image_source,
+                                                       int x, int y, int width,
+                                                       int height,
+                                                       int destination_x,
+                                                       int destination_y);
+   EAPI void imlib_image_scroll_rect(int x, int y, int width, int height,
+                                     int delta_x, int delta_y);
+   EAPI void imlib_image_copy_rect(int x, int y, int width, int height, int new_x,
+                                   int new_y);
+
+/* polygons */
+   EAPI ImlibPolygon imlib_polygon_new(void);
+   EAPI void imlib_polygon_free(ImlibPolygon poly);
+   EAPI void imlib_polygon_add_point(ImlibPolygon poly, int x, int y);
+   EAPI void imlib_image_draw_polygon(ImlibPolygon poly, unsigned char closed);
+   EAPI void imlib_image_fill_polygon(ImlibPolygon poly);
+   EAPI void imlib_polygon_get_bounds(ImlibPolygon poly, int *px1, int *py1,
+                                      int *px2, int *py2);
+   EAPI unsigned char imlib_polygon_contains_point(ImlibPolygon poly, int x,
+                                                   int y);
+
+/* ellipses */
+   EAPI void imlib_image_draw_ellipse(int xc, int yc, int a, int b);
+   EAPI void imlib_image_fill_ellipse(int xc, int yc, int a, int b);
+
+/* color ranges */
+   EAPI Imlib_Color_Range imlib_create_color_range(void);
+   EAPI void imlib_free_color_range(void);
+   EAPI void imlib_add_color_to_color_range(int distance_away);
+   EAPI void imlib_image_fill_color_range_rectangle(int x, int y, int width,
+                                                    int height, double angle);
+   EAPI void imlib_image_fill_hsva_color_range_rectangle(int x, int y, int width,
+                                                         int height, double angle);
+
+/* image data */
+   EAPI void imlib_image_attach_data_value(const char *key, void *data, int value,
+                                           Imlib_Data_Destructor_Function
+                                           destructor_function);
+   EAPI void *imlib_image_get_attached_data(const char *key);
+   EAPI int imlib_image_get_attached_value(const char *key);
+   EAPI void imlib_image_remove_attached_data_value(const char *key);
+   EAPI void imlib_image_remove_and_free_attached_data_value(const char *key);
+
+/* saving */
+   EAPI void imlib_save_image(const char *filename);
+   EAPI void imlib_save_image_with_error_return(const char *filename,
+                                                Imlib_Load_Error * error_return);
+
+/* FIXME: */
+/* need to add arbitary rotation routines */
+
+/* rotation/skewing */
+   EAPI Imlib_Image imlib_create_rotated_image(double angle);
+
+/* rotation from buffer to context (without copying)*/
+   EAPI void imlib_rotate_image_from_buffer(double angle, 
+				       Imlib_Image source_image);
+
+   EAPI void imlib_blend_image_onto_image_at_angle(Imlib_Image source_image,
+                                                   char merge_alpha, int source_x,
+                                                   int source_y, int source_width,
+                                                   int source_height,
+                                                   int destination_x,
+                                                   int destination_y, int angle_x,
+                                                   int angle_y);
+   EAPI void imlib_blend_image_onto_image_skewed(Imlib_Image source_image,
+                                                 char merge_alpha, int source_x,
+                                                 int source_y, int source_width,
+                                                 int source_height,
+                                                 int destination_x,
+                                                 int destination_y, int h_angle_x,
+                                                 int h_angle_y, int v_angle_x,
+                                                 int v_angle_y);
+# ifndef X_DISPLAY_MISSING
+   EAPI void imlib_render_image_on_drawable_skewed(int source_x, int source_y,
+                                                   int source_width,
+                                                   int source_height,
+                                                   int destination_x,
+                                                   int destination_y,
+                                                   int h_angle_x, int h_angle_y,
+                                                   int v_angle_x, int v_angle_y);
+   EAPI void imlib_render_image_on_drawable_at_angle(int source_x, int source_y,
+                                                     int source_width,
+                                                     int source_height,
+                                                     int destination_x,
+                                                     int destination_y,
+                                                     int angle_x, int angle_y);
+# endif
+
+/* image filters */
+   EAPI void imlib_image_filter(void);
+   EAPI Imlib_Filter imlib_create_filter(int initsize);
+   EAPI void imlib_context_set_filter(Imlib_Filter filter);
+   EAPI Imlib_Filter imlib_context_get_filter(void);
+   EAPI void imlib_free_filter(void);
+   EAPI void imlib_filter_set(int xoff, int yoff, int a, int r, int g, int b);
+   EAPI void imlib_filter_set_alpha(int xoff, int yoff, int a, int r, int g,
+                                    int b);
+   EAPI void imlib_filter_set_red(int xoff, int yoff, int a, int r, int g, int b);
+   EAPI void imlib_filter_set_green(int xoff, int yoff, int a, int r, int g,
+                                    int b);
+   EAPI void imlib_filter_set_blue(int xoff, int yoff, int a, int r, int g, int b);
+   EAPI void imlib_filter_constants(int a, int r, int g, int b);
+   EAPI void imlib_filter_divisors(int a, int r, int g, int b);
+
+   EAPI void imlib_apply_filter(char *script, ...);
+
+   EAPI void imlib_image_clear(void);
+   EAPI void imlib_image_clear_color(int r, int g, int b, int a);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
diff --git a/lib-x86-32/include/zip.h b/lib-x86-32/include/zip.h
new file mode 100644
index 00000000..f8b55ac0
--- /dev/null
+++ b/lib-x86-32/include/zip.h
@@ -0,0 +1,274 @@
+#ifndef _HAD_ZIP_H
+#define _HAD_ZIP_H
+
+/*
+  zip.h -- exported declarations.
+  Copyright (C) 1999-2011 Dieter Baron and Thomas Klausner
+
+  This file is part of libzip, a library to manipulate ZIP archives.
+  The authors can be contacted at <libzip@nih.at>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+  3. The names of the authors may not be used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+
+#ifndef ZIP_EXTERN
+#ifdef _WIN32
+#define ZIP_EXTERN __declspec(dllimport)
+#else
+#define ZIP_EXTERN
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zipconf.h>
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <time.h>
+
+/* flags for zip_open */
+
+#define ZIP_CREATE           1
+#define ZIP_EXCL             2
+#define ZIP_CHECKCONS        4
+
+
+/* flags for zip_name_locate, zip_fopen, zip_stat, ... */
+
+#define ZIP_FL_NOCASE		1 /* ignore case on name lookup */
+#define ZIP_FL_NODIR		2 /* ignore directory component */
+#define ZIP_FL_COMPRESSED	4 /* read compressed data */
+#define ZIP_FL_UNCHANGED	8 /* use original data, ignoring changes */
+#define ZIP_FL_RECOMPRESS      16 /* force recompression of data */
+#define ZIP_FL_ENCRYPTED       32 /* read encrypted data
+				     (implies ZIP_FL_COMPRESSED) */
+
+/* archive global flags flags */
+
+#define ZIP_AFL_TORRENT		1 /* torrent zipped */
+#define ZIP_AFL_RDONLY		2 /* read only -- cannot be cleared */
+
+
+/* flags for compression and encryption sources */
+
+#define ZIP_CODEC_ENCODE	1 /* compress/encrypt */
+
+
+/* libzip error codes */
+
+#define ZIP_ER_OK             0  /* N No error */
+#define ZIP_ER_MULTIDISK      1  /* N Multi-disk zip archives not supported */
+#define ZIP_ER_RENAME         2  /* S Renaming temporary file failed */
+#define ZIP_ER_CLOSE          3  /* S Closing zip archive failed */
+#define ZIP_ER_SEEK           4  /* S Seek error */
+#define ZIP_ER_READ           5  /* S Read error */
+#define ZIP_ER_WRITE          6  /* S Write error */
+#define ZIP_ER_CRC            7  /* N CRC error */
+#define ZIP_ER_ZIPCLOSED      8  /* N Containing zip archive was closed */
+#define ZIP_ER_NOENT          9  /* N No such file */
+#define ZIP_ER_EXISTS        10  /* N File already exists */
+#define ZIP_ER_OPEN          11  /* S Can't open file */
+#define ZIP_ER_TMPOPEN       12  /* S Failure to create temporary file */
+#define ZIP_ER_ZLIB          13  /* Z Zlib error */
+#define ZIP_ER_MEMORY        14  /* N Malloc failure */
+#define ZIP_ER_CHANGED       15  /* N Entry has been changed */
+#define ZIP_ER_COMPNOTSUPP   16  /* N Compression method not supported */
+#define ZIP_ER_EOF           17  /* N Premature EOF */
+#define ZIP_ER_INVAL         18  /* N Invalid argument */
+#define ZIP_ER_NOZIP         19  /* N Not a zip archive */
+#define ZIP_ER_INTERNAL      20  /* N Internal error */
+#define ZIP_ER_INCONS        21  /* N Zip archive inconsistent */
+#define ZIP_ER_REMOVE        22  /* S Can't remove file */
+#define ZIP_ER_DELETED       23  /* N Entry has been deleted */
+#define ZIP_ER_ENCRNOTSUPP   24  /* N Encryption method not supported */
+#define ZIP_ER_RDONLY        25  /* N Read-only archive */ 
+#define ZIP_ER_NOPASSWD      26  /* N No password provided */
+#define ZIP_ER_WRONGPASSWD   27  /* N Wrong password provided */
+
+/* type of system error value */
+
+#define ZIP_ET_NONE	      0  /* sys_err unused */
+#define ZIP_ET_SYS	      1  /* sys_err is errno */
+#define ZIP_ET_ZLIB	      2  /* sys_err is zlib error code */
+
+/* compression methods */
+
+#define ZIP_CM_DEFAULT	      -1  /* better of deflate or store */
+#define ZIP_CM_STORE	       0  /* stored (uncompressed) */
+#define ZIP_CM_SHRINK	       1  /* shrunk */
+#define ZIP_CM_REDUCE_1	       2  /* reduced with factor 1 */
+#define ZIP_CM_REDUCE_2	       3  /* reduced with factor 2 */
+#define ZIP_CM_REDUCE_3	       4  /* reduced with factor 3 */
+#define ZIP_CM_REDUCE_4	       5  /* reduced with factor 4 */
+#define ZIP_CM_IMPLODE	       6  /* imploded */
+/* 7 - Reserved for Tokenizing compression algorithm */
+#define ZIP_CM_DEFLATE	       8  /* deflated */
+#define ZIP_CM_DEFLATE64       9  /* deflate64 */
+#define ZIP_CM_PKWARE_IMPLODE 10  /* PKWARE imploding */
+/* 11 - Reserved by PKWARE */
+#define ZIP_CM_BZIP2          12  /* compressed using BZIP2 algorithm */
+/* 13 - Reserved by PKWARE */
+#define ZIP_CM_LZMA	      14  /* LZMA (EFS) */
+/* 15-17 - Reserved by PKWARE */
+#define ZIP_CM_TERSE	      18  /* compressed using IBM TERSE (new) */
+#define ZIP_CM_LZ77           19  /* IBM LZ77 z Architecture (PFS) */
+#define ZIP_CM_WAVPACK	      97  /* WavPack compressed data */
+#define ZIP_CM_PPMD	      98  /* PPMd version I, Rev 1 */
+
+/* encryption methods */
+
+#define ZIP_EM_NONE	       0  /* not encrypted */
+#define ZIP_EM_TRAD_PKWARE     1  /* traditional PKWARE encryption */
+#if 0 /* Strong Encryption Header not parsed yet */
+#define ZIP_EM_DES        0x6601  /* strong encryption: DES */
+#define ZIP_EM_RC2_OLD    0x6602  /* strong encryption: RC2, version < 5.2 */
+#define ZIP_EM_3DES_168   0x6603
+#define ZIP_EM_3DES_112   0x6609
+#define ZIP_EM_AES_128    0x660e
+#define ZIP_EM_AES_192    0x660f
+#define ZIP_EM_AES_256    0x6610
+#define ZIP_EM_RC2        0x6702  /* strong encryption: RC2, version >= 5.2 */
+#define ZIP_EM_RC4        0x6801
+#endif
+#define ZIP_EM_UNKNOWN    0xffff  /* unknown algorithm */
+
+
+
+enum zip_source_cmd {
+    ZIP_SOURCE_OPEN,	/* prepare for reading */
+    ZIP_SOURCE_READ, 	/* read data */
+    ZIP_SOURCE_CLOSE,	/* reading is done */
+    ZIP_SOURCE_STAT,	/* get meta information */
+    ZIP_SOURCE_ERROR,	/* get error information */
+    ZIP_SOURCE_FREE	/* cleanup and free resources */
+};
+
+#define ZIP_SOURCE_ERR_LOWER	-2
+
+#define ZIP_STAT_NAME			0x0001
+#define ZIP_STAT_INDEX			0x0002
+#define ZIP_STAT_SIZE			0x0004
+#define ZIP_STAT_COMP_SIZE		0x0008
+#define ZIP_STAT_MTIME			0x0010
+#define ZIP_STAT_CRC			0x0020
+#define ZIP_STAT_COMP_METHOD		0x0040
+#define ZIP_STAT_ENCRYPTION_METHOD	0x0080
+#define ZIP_STAT_FLAGS			0x0100
+
+struct zip_stat {
+    zip_uint64_t valid;			/* which fields have valid values */
+    const char *name;			/* name of the file */
+    zip_uint64_t index;			/* index within archive */
+    zip_uint64_t size;			/* size of file (uncompressed) */
+    zip_uint64_t comp_size;		/* size of file (compressed) */
+    time_t mtime;			/* modification time */
+    zip_uint32_t crc;			/* crc of file data */
+    zip_uint16_t comp_method;		/* compression method used */
+    zip_uint16_t encryption_method;	/* encryption method used */
+    zip_uint32_t flags;			/* reserved for future use */
+};
+
+struct zip;
+struct zip_file;
+struct zip_source;
+
+typedef zip_int64_t (*zip_source_callback)(void *, void *, zip_uint64_t,
+					   enum zip_source_cmd);
+
+
+
+ZIP_EXTERN zip_int64_t zip_add(struct zip *, const char *, struct zip_source *);
+ZIP_EXTERN zip_int64_t zip_add_dir(struct zip *, const char *);
+ZIP_EXTERN int zip_close(struct zip *);
+ZIP_EXTERN int zip_delete(struct zip *, zip_uint64_t);
+ZIP_EXTERN void zip_error_clear(struct zip *);
+ZIP_EXTERN void zip_error_get(struct zip *, int *, int *);
+ZIP_EXTERN int zip_error_get_sys_type(int);
+ZIP_EXTERN int zip_error_to_str(char *, zip_uint64_t, int, int);
+ZIP_EXTERN int zip_fclose(struct zip_file *);
+ZIP_EXTERN struct zip *zip_fdopen(int, int, int *);
+ZIP_EXTERN void zip_file_error_clear(struct zip_file *);
+ZIP_EXTERN void zip_file_error_get(struct zip_file *, int *, int *);
+ZIP_EXTERN const char *zip_file_strerror(struct zip_file *);
+ZIP_EXTERN struct zip_file *zip_fopen(struct zip *, const char *, int);
+ZIP_EXTERN struct zip_file *zip_fopen_encrypted(struct zip *, const char *,
+						int, const char *);
+ZIP_EXTERN struct zip_file *zip_fopen_index(struct zip *, zip_uint64_t, int);
+ZIP_EXTERN struct zip_file *zip_fopen_index_encrypted(struct zip *,
+						      zip_uint64_t, int,
+						      const char *);
+ZIP_EXTERN zip_int64_t zip_fread(struct zip_file *, void *, zip_uint64_t);
+ZIP_EXTERN const char *zip_get_archive_comment(struct zip *, int *, int);
+ZIP_EXTERN int zip_get_archive_flag(struct zip *, int, int);
+ZIP_EXTERN const char *zip_get_file_comment(struct zip *, zip_uint64_t,
+					    int *, int);
+ZIP_EXTERN const char *zip_get_file_extra(struct zip *, zip_uint64_t,
+					  int *, int);
+ZIP_EXTERN const char *zip_get_name(struct zip *, zip_uint64_t, int);
+ZIP_EXTERN zip_uint64_t zip_get_num_entries(struct zip *, int);
+ZIP_EXTERN int zip_get_num_files(struct zip *);  /* deprecated, use zip_get_num_entries instead */
+ZIP_EXTERN int zip_name_locate(struct zip *, const char *, int);
+ZIP_EXTERN struct zip *zip_open(const char *, int, int *);
+ZIP_EXTERN int zip_rename(struct zip *, zip_uint64_t, const char *);
+ZIP_EXTERN int zip_replace(struct zip *, zip_uint64_t, struct zip_source *);
+ZIP_EXTERN int zip_set_archive_comment(struct zip *, const char *, int);
+ZIP_EXTERN int zip_set_archive_flag(struct zip *, int, int);
+ZIP_EXTERN int zip_set_default_password(struct zip *, const char *);
+ZIP_EXTERN int zip_set_file_comment(struct zip *, zip_uint64_t,
+				    const char *, int);
+ZIP_EXTERN int zip_set_file_extra(struct zip *, zip_uint64_t,
+				  const char *, int);
+ZIP_EXTERN struct zip_source *zip_source_buffer(struct zip *, const void *,
+						zip_uint64_t, int);
+ZIP_EXTERN struct zip_source *zip_source_file(struct zip *, const char *,
+					      zip_uint64_t, zip_int64_t);
+ZIP_EXTERN struct zip_source *zip_source_filep(struct zip *, FILE *,
+					       zip_uint64_t, zip_int64_t);
+ZIP_EXTERN void zip_source_free(struct zip_source *);
+ZIP_EXTERN struct zip_source *zip_source_function(struct zip *,
+						  zip_source_callback, void *);
+ZIP_EXTERN struct zip_source *zip_source_zip(struct zip *, struct zip *,
+					     zip_uint64_t, int,
+					     zip_uint64_t, zip_int64_t);
+ZIP_EXTERN int zip_stat(struct zip *, const char *, int, struct zip_stat *);
+ZIP_EXTERN int zip_stat_index(struct zip *, zip_uint64_t, int,
+			      struct zip_stat *);
+ZIP_EXTERN void zip_stat_init(struct zip_stat *);
+ZIP_EXTERN const char *zip_strerror(struct zip *);
+ZIP_EXTERN int zip_unchange(struct zip *, zip_uint64_t);
+ZIP_EXTERN int zip_unchange_all(struct zip *);
+ZIP_EXTERN int zip_unchange_archive(struct zip *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAD_ZIP_H */
diff --git a/lib-x86-32/include/zipconf.h b/lib-x86-32/include/zipconf.h
new file mode 100644
index 00000000..95960941
--- /dev/null
+++ b/lib-x86-32/include/zipconf.h
@@ -0,0 +1,47 @@
+#ifndef _HAD_ZIPCONF_H
+#define _HAD_ZIPCONF_H
+
+/*
+   zipconf.h -- platform specific include file
+
+   This file was generated automatically by ./make_zipconf.sh
+   based on ../config.h.
+ */
+
+#define LIBZIP_VERSION "0.10"
+#define LIBZIP_VERSION_MAJOR 0
+#define LIBZIP_VERSION_MINOR 10
+#define LIBZIP_VERSION_MICRO 0
+
+#include <inttypes.h>
+
+typedef int8_t zip_int8_t;
+#define ZIP_INT8_MIN INT8_MIN
+#define ZIP_INT8_MAX INT8_MAX
+
+typedef uint8_t zip_uint8_t;
+#define ZIP_UINT8_MAX UINT8_MAX
+
+typedef int16_t zip_int16_t;
+#define ZIP_INT16_MIN INT16_MIN
+#define ZIP_INT16_MAX INT16_MAX
+
+typedef uint16_t zip_uint16_t;
+#define ZIP_UINT16_MAX UINT16_MAX
+
+typedef int32_t zip_int32_t;
+#define ZIP_INT32_MIN INT32_MIN
+#define ZIP_INT32_MAX INT32_MAX
+
+typedef uint32_t zip_uint32_t;
+#define ZIP_UINT32_MAX UINT32_MAX
+
+typedef int64_t zip_int64_t;
+#define ZIP_INT64_MIN INT64_MIN
+#define ZIP_INT64_MAX INT64_MAX
+
+typedef uint64_t zip_uint64_t;
+#define ZIP_UINT64_MAX UINT64_MAX
+
+
+#endif /* zipconf.h */
diff --git a/lib-x86-32/libImlib2.a b/lib-x86-32/libImlib2.a
new file mode 100644
index 00000000..c97354eb
--- /dev/null
+++ b/lib-x86-32/libImlib2.a
diff --git a/lib-x86-32/libzip.a b/lib-x86-32/libzip.a
new file mode 100644
index 00000000..a28776be
--- /dev/null
+++ b/lib-x86-32/libzip.a
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index 35ee48a1..d5caf566 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -3,7 +3,7 @@ VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
 export APBUILD_STATIC_LIBGCC=1
 
-CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable=yes --disable-pulse --disable-mpris --disable-nls
+CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable --disable-nls --disable-pulse
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 make clean
 make -j9
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index 41c573dd..51adbec2 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 OSTYPE=`uname -s`
-OUTDIR=deadbeef-$VERSION-portable
+OUTDIR=portable/deadbeef-$VERSION
 PLUGDIR=$OUTDIR/plugins
 DOCDIR=$OUTDIR/doc
 PIXMAPDIR=$OUTDIR/pixmaps
@@ -9,27 +9,33 @@ mkdir -p $PLUGDIR
 mkdir -p $DOCDIR
 mkdir -p $PIXMAPDIR
 
-cp ./deadbeef ./deadbeef-$VERSION-portable/
+cp ./deadbeef $OUTDIR
 
 for i in nullout cdda flac alsa mpgmad hotkeys vtx \
 	 ffap ffmpeg wavpack vorbis oss vfs_curl \
 	 lastfm sid adplug sndfile artwork \
 	 supereq gme dumb notify musepack wildmidi \
-	 tta dca aac mms shn ao shellexec; do
-	 if [ -f ./plugins/$i/.libs/$i.so ]; then
+	 tta dca aac mms shn ao shellexec vfs_zip \
+	 m3u ; do
+    if [ -f ./plugins/$i/.libs/$i.so ]; then
 		 cp ./plugins/$i/.libs/$i.so $PLUGDIR/
 	else
-		echo $i not found
+		echo ./plugins/$i/.libs/$i.so not found
 	fi
+    if [ -f ./plugins/$i/.libs/$i.fallback.so ]; then
+		 cp ./plugins/$i/.libs/$i.fallback.so $PLUGDIR/
+    fi
 done
 
-for i in gtkui gtkui.fallback;do
-	if [ -f ./plugins/$i/.libs/$i.so ]; then
-		cp ./plugins/$i/.libs/$i.so $PLUGDIR/
-	else
-		echo $i not found
-	fi
-done
+if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.so ]; then
+    cp ./plugins/gtkui/.libs/ddb_gui_GTK2.so $PLUGDIR/
+else
+    echo ./plugins/gtkui/.libs/ddb_gui_GTK2.so not found
+fi
+if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so ]; then
+    cp ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so $PLUGDIR/
+fi
+
 
 #pixmaps
 
@@ -47,6 +53,6 @@ cp ./icons/32x32/deadbeef.png $OUTDIR/
 
 # strip
 if [ $OSTYPE != 'Darwin' ];then
-	strip --strip-unneeded ./deadbeef-$VERSION-portable/deadbeef
+	strip --strip-unneeded $OUTDIR/deadbeef
 	for i in $PLUGDIR/*.so ; do strip --strip-unneeded $i ; done
 fi
diff --git a/tools/pluginfo/pluginfo.c b/tools/pluginfo/pluginfo.c
index d5d20de2..09cbeb78 100644
--- a/tools/pluginfo/pluginfo.c
+++ b/tools/pluginfo/pluginfo.c
@@ -68,8 +68,6 @@ main (int argc, char *argv[]) {
     printf ("id=\"%s\"\n", plug->id);
     printf ("name=\"%s\"\n", plug->name);
     printf ("descr=\"%s\"\n", plug->descr);
-    printf ("author=\"%s\"\n", plug->author);
-    printf ("email=\"%s\"\n", plug->email);
     printf ("website=\"%s\"\n", plug->website);
 
     dlclose (handle);