diff -ru t/ddiwrapper/gdi32/Makefile ddiwrapper-0.3rc1/gdi32/Makefile
--- t/ddiwrapper/gdi32/Makefile	2008-04-03 02:05:18.000000000 +0300
+++ ddiwrapper-0.3rc1/gdi32/Makefile	2009-07-17 13:53:39.000000000 +0300
@@ -10,8 +10,8 @@
 
 ### Common settings
 
-CEXTRA                = -mno-cygwin -fPIC -fpack-struct -D_ANONYMOUS_UNION= -D_ANONYMOUS_STRUCT= -D__INTERLOCKED_DECLARED -g -Wall
-CXXEXTRA              = -mno-cygwin
+CEXTRA                = -m32 -mno-cygwin -fPIC -fpack-struct -D_ANONYMOUS_UNION= -D_ANONYMOUS_STRUCT= -D__INTERLOCKED_DECLARED -g -Wall
+CXXEXTRA              = -m32 -mno-cygwin
 RCEXTRA               =
 INCLUDE_PATH          = -I../include -I/usr/local/include/wine -I/usr/include/wine -I/usr/include/wine/windows
 DLL_PATH              =
@@ -26,7 +26,7 @@
 
 gdi32_dll_CXX_SRCS =
 gdi32_dll_RC_SRCS  =
-gdi32_dll_LDFLAGS  = -mno-cygwin
+gdi32_dll_LDFLAGS  = -m32 -mno-cygwin
 gdi32_dll_DLL_PATH =
 gdi32_dll_DLLS     = odbc32 \
 			ole32 \
diff -ru t/ddiwrapper/Makefile ddiwrapper-0.3rc1/Makefile
--- t/ddiwrapper/Makefile	2008-04-05 23:03:16.000000000 +0300
+++ ddiwrapper-0.3rc1/Makefile	2009-07-17 13:54:40.000000000 +0300
@@ -25,8 +25,8 @@
 ddiwrapper_exe_C_SRCS   = main.c load.c options.c render.c util.c
 ddiwrapper_exe_CXX_SRCS =
 #ddiwrapper_exe_RC_SRCS  = rsrc.rc
-ddiwrapper_exe_LDFLAGS  = -mwindows \
-			-mno-cygwin
+ddiwrapper_exe_LDFLAGS  = -m32 -mwindows \
+			-mno-cygwin -L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32
 ddiwrapper_exe_DLL_PATH =
 ddiwrapper_exe_DLLS     = odbc32 \
 			ole32 \
diff -ru t/ddiwrapper/tools/excanondriver ddiwrapper-0.3rc1/tools/excanondriver
--- t/ddiwrapper/tools/excanondriver	2007-05-02 11:58:02.000000000 +0300
+++ ddiwrapper-0.3rc1/tools/excanondriver	2009-07-17 17:12:29.000000000 +0300
@@ -47,6 +47,7 @@
 	exit 1
 fi
 
+
 tmpdir=`mktemp -d`
 
 if test -z "$tmpdir"
@@ -55,6 +56,9 @@
 	exit 2
 fi
 
+if test -d "$src"  ; then 
+	cp -a $src*  $tmpdir
+else
 if ! unzip -qd $tmpdir "$src" 2>/dev/null
 then
 	if ! lha "xqw=$tmpdir" "$src"
@@ -64,6 +68,7 @@
 		exit 3
 	fi
 fi
+fi
 
 cd $tmpdir
 cd "`dirname "\`find -type f -name "*.[Ii][Nn][Ff]"|tail -n 1\`"`"
diff -ru t/ddiwrapper/winspool/Makefile ddiwrapper-0.3rc1/winspool/Makefile
--- t/ddiwrapper/winspool/Makefile	2008-04-03 02:05:18.000000000 +0300
+++ ddiwrapper-0.3rc1/winspool/Makefile	2009-07-17 13:54:12.000000000 +0300
@@ -25,7 +25,7 @@
 winspool_dll_C_SRCS   = info.c util.c
 winspool_dll_CXX_SRCS =
 winspool_dll_RC_SRCS  =
-winspool_dll_LDFLAGS  = -mno-cygwin
+winspool_dll_LDFLAGS  = -m32 -mno-cygwin
 winspool_dll_DLL_PATH =
 winspool_dll_DLLS     = odbc32 \
 			ole32 \