[ooo-build-commit] 2 commits - configure.in distro-configs/CrossWin32.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Jul 2 10:14:08 PDT 2009
configure.in | 8
distro-configs/CrossWin32.conf.in | 11
patches/dev300/apply | 10
patches/dev300/crosswin32-bridges-mingw.diff | 276 +++++++++
patches/dev300/crosswin32-dtrans-mingw.diff | 130 ++++
patches/dev300/crosswin32-embedserv-mingw.diff | 23
patches/dev300/crosswin32-hyphen-mingw.diff | 11
patches/dev300/crosswin32-i18npool-cross.diff | 10
patches/dev300/crosswin32-icc-cross.diff | 6
patches/dev300/crosswin32-odk-cross.diff | 23
patches/dev300/crosswin32-pyuno-mingw.diff | 10
patches/dev300/crosswin32-sal-mingw-c.diff | 141 ++++
patches/dev300/crosswin32-scp2-mingw.diff | 4
patches/dev300/crosswin32-solenv-mingw.diff | 717 ++++++++++++++++++++++++-
patches/dev300/crosswin32-svtools-minimal.diff | 84 --
patches/dev300/crosswin32-ugly-hacks.diff | 53 +
patches/dev300/crosswin32-vcl-mingw.diff | 186 ------
17 files changed, 1412 insertions(+), 291 deletions(-)
New commits:
commit 69e77b5ca021c6c3139cffbb22b0a14be502f952
Author: Jesús Corrius <jesus at softcatala.org>
Date: Thu Jul 2 15:32:24 2009 +0200
Update the previous patch to work with the current code
* configure.in:
* distro-configs/CrossWin32.conf.in:
* patches/dev300/apply:
* patches/dev300/crosswin32-vcl-mingw.diff:
diff --git a/configure.in b/configure.in
index ed465b0..d509e0f 100644
--- a/configure.in
+++ b/configure.in
@@ -748,7 +748,7 @@ AC_SUBST(OOOP_TEMPLATES_PACK)
AC_MSG_CHECKING([for widget sets])
OOO_WIDGET_FLAGS=
if test "$enable_kde" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
OOO_WIDGET_FLAGS="--enable-kde"
widget_sets="kde"
fi
@@ -757,7 +757,7 @@ else
fi
if test "$enable_kde4" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
widget_sets="$widget_sets kde4"
fi
@@ -770,7 +770,7 @@ OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
AC_SUBST(OXYGEN_IMAGES_TAR)
if test "$enable_gtk" != "no"; then
- if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" = "CrossWin32"; then
OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
widget_sets="gtk $widget_sets"
@@ -1140,7 +1140,7 @@ AC_SUBST(ENABLE_EXTENSIONS)
# FIXME: ugly hack to apply a Linux and Win32 specific variants of a patch for swext sources
if test "$ENABLE_EXTENSIONS" = "YES" ; then
- if test "$BUILD_WIN32" = "yes" ; then
+ if test "$BUILD_WIN32" = "yes" -o "$with_distro" = "CrossWin32"; then
ext_section=Win32OnlyExtensionFixes
else
ext_section=Linux32OnlyExtensionFixes
diff --git a/distro-configs/CrossWin32.conf.in b/distro-configs/CrossWin32.conf.in
index 8422f99..270f296 100644
--- a/distro-configs/CrossWin32.conf.in
+++ b/distro-configs/CrossWin32.conf.in
@@ -26,3 +26,4 @@
--with-system-libwpd
--with-system-neon
--with-system-poppler
+--with-system-lpsolve
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8d08788..ef7247b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3249,7 +3249,6 @@ crosswin32-dbaccess-mingw.diff
crosswin32-desktop-mingw.diff
crosswin32-dtrans-mingw.diff
crosswin32-embeddedobj-mingw.diff
-crosswin32-embedserv.mingw.diff
crosswin32-extensions-mingw.diff
crosswin32-external-mingwheaders.diff
crosswin32-fpicker-mingw.diff
diff --git a/patches/dev300/crosswin32-vcl-mingw.diff b/patches/dev300/crosswin32-vcl-mingw.diff
index ebe4f5c..6481d7c 100644
--- a/patches/dev300/crosswin32-vcl-mingw.diff
+++ b/patches/dev300/crosswin32-vcl-mingw.diff
@@ -59,180 +59,6 @@
delete pSalData;
}
---- vcl/win/source/src/salsrc.rc.pristine 2008-10-30 13:51:23.000000000 +0100
-+++ vcl/win/source/src/salsrc.rc 2008-10-30 13:53:31.000000000 +0100
-@@ -35,90 +35,90 @@
- #include <salids.hrc>
- #endif
-
--SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
-+SAL_RESID_POINTER_NULL CURSOR nullptr.cur
- #if ( WINVER < 0x0400 )
--SAL_RESID_POINTER_HELP CURSOR HELP.CUR
-+SAL_RESID_POINTER_HELP CURSOR help.cur
- #endif
- #ifndef WNT
--SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR
--SAL_RESID_POINTER_VSIZE CURSOR VSIZE.CUR
--SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
--SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
-+SAL_RESID_POINTER_HSIZE CURSOR hsize.cur
-+SAL_RESID_POINTER_VSIZE CURSOR vsize.cur
-+SAL_RESID_POINTER_NESWSIZE CURSOR neswsize.cur
-+SAL_RESID_POINTER_NWSESIZE CURSOR nwsesize.cur
- #endif
--SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR
--SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR
--SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR
--SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR
--SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR
--SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR
--SAL_RESID_POINTER_HAND CURSOR HAND.CUR
--SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR
--SAL_RESID_POINTER_PEN CURSOR PEN.CUR
--SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR
--SAL_RESID_POINTER_FILL CURSOR FILL.CUR
--SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
--SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
--SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
--SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
--SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR
--SAL_RESID_POINTER_CROP CURSOR CROP.CUR
--SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
--SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR
--SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
--SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
--SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
--SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR
--SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR
--SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
--SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
--SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
--SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR
--SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR
--SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
--SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
--SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR
--SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
--SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
--SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR
--SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR
--SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
--SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
--SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR
--SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR
--SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
--SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR
--SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
--SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR
--SAL_RESID_POINTER_CHART CURSOR CHART.CUR
--SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
--SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
--SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
--SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR
--SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR
--SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR
--SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR
--SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR
--SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR
--SAL_RESID_POINTER_AUTOSCROLL_N CURSOR ASN.CUR
--SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR
--SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR
--SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR
--SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
--SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
--SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
--SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
--SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
--SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
--SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR
--SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
--SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
--SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
--SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
--SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
--SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
--SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
--SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
-+SAL_RESID_POINTER_CROSS CURSOR cross.cur
-+SAL_RESID_POINTER_MOVE CURSOR move.cur
-+SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur
-+SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur
-+SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur
-+SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur
-+SAL_RESID_POINTER_HAND CURSOR hand.cur
-+SAL_RESID_POINTER_REFHAND CURSOR refhand.cur
-+SAL_RESID_POINTER_PEN CURSOR pen.cur
-+SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur
-+SAL_RESID_POINTER_FILL CURSOR fill.cur
-+SAL_RESID_POINTER_ROTATE CURSOR rotate.cur
-+SAL_RESID_POINTER_HSHEAR CURSOR hshear.cur
-+SAL_RESID_POINTER_VSHEAR CURSOR vshear.cur
-+SAL_RESID_POINTER_MIRROR CURSOR mirror.cur
-+SAL_RESID_POINTER_CROOK CURSOR crook.cur
-+SAL_RESID_POINTER_CROP CURSOR crop.cur
-+SAL_RESID_POINTER_MOVEPOINT CURSOR movept.cur
-+SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR movebw.cur
-+SAL_RESID_POINTER_MOVEDATA CURSOR movedata.cur
-+SAL_RESID_POINTER_COPYDATA CURSOR copydata.cur
-+SAL_RESID_POINTER_LINKDATA CURSOR linkdata.cur
-+SAL_RESID_POINTER_MOVEDATALINK CURSOR movedlnk.cur
-+SAL_RESID_POINTER_COPYDATALINK CURSOR copydlnk.cur
-+SAL_RESID_POINTER_MOVEFILE CURSOR movef.cur
-+SAL_RESID_POINTER_COPYFILE CURSOR copyf.cur
-+SAL_RESID_POINTER_LINKFILE CURSOR linkf.cur
-+SAL_RESID_POINTER_MOVEFILELINK CURSOR moveflnk.cur
-+SAL_RESID_POINTER_COPYFILELINK CURSOR copyflnk.cur
-+SAL_RESID_POINTER_MOVEFILES CURSOR movef2.cur
-+SAL_RESID_POINTER_COPYFILES CURSOR copyf2.cur
-+SAL_RESID_POINTER_NOTALLOWED CURSOR notallow.cur
-+SAL_RESID_POINTER_DRAW_LINE CURSOR dline.cur
-+SAL_RESID_POINTER_DRAW_RECT CURSOR drect.cur
-+SAL_RESID_POINTER_DRAW_POLYGON CURSOR dpolygon.cur
-+SAL_RESID_POINTER_DRAW_BEZIER CURSOR dbezier.cur
-+SAL_RESID_POINTER_DRAW_ARC CURSOR darc.cur
-+SAL_RESID_POINTER_DRAW_PIE CURSOR dpie.cur
-+SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR dcirccut.cur
-+SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR dellipse.cur
-+SAL_RESID_POINTER_DRAW_FREEHAND CURSOR dfree.cur
-+SAL_RESID_POINTER_DRAW_CONNECT CURSOR dconnect.cur
-+SAL_RESID_POINTER_DRAW_TEXT CURSOR dtext.cur
-+SAL_RESID_POINTER_DRAW_CAPTION CURSOR dcapt.cur
-+SAL_RESID_POINTER_CHART CURSOR chart.cur
-+SAL_RESID_POINTER_DETECTIVE CURSOR detectiv.cur
-+SAL_RESID_POINTER_PIVOT_COL CURSOR pivotcol.cur
-+SAL_RESID_POINTER_PIVOT_ROW CURSOR pivotrow.cur
-+SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur
-+SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
-+SAL_RESID_POINTER_CHAIN CURSOR chain.cur
-+SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
-+SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
-+SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
-+SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
-+SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
-+SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
-+SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ase.cur
-+SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR asnw.cur
-+SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR asne.cur
-+SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR assw.cur
-+SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur
-+SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur
-+SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur
-+SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur
-+SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur
-+SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur
-+SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur
-+SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur
-+SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
-+SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
-+SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
-+SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
-
--SAL_RESID_BITMAP_50 BITMAP 50.BMP
-+SAL_RESID_BITMAP_50 BITMAP 50.bmp
-
--SAL_RESID_ICON_DEFAULT ICON SD.ICO
-+SAL_RESID_ICON_DEFAULT ICON sd.ico
--- vcl/win/source/gdi/salnativewidgets-luna.cxx.pristine 2008-10-30 13:50:29.000000000 +0100
+++ vcl/win/source/gdi/salnativewidgets-luna.cxx 2008-10-30 13:49:24.000000000 +0100
@@ -31,6 +31,11 @@
@@ -379,13 +205,13 @@
--- vcl/win/source/src/salsrc.rc.orig 2009-07-01 12:26:36.000000000 +0200
+++ vcl/win/source/src/salsrc.rc 2009-07-01 13:25:14.000000000 +0200
@@ -119,6 +119,6 @@
- SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
- SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
+ SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
+ SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
--SAL_RESID_BITMAP_50 BITMAP 50.bmp
-+SAL_RESID_BITMAP_50 BITMAP "50.bmp"
+-SAL_RESID_BITMAP_50 BITMAP 50.BMP
++SAL_RESID_BITMAP_50 BITMAP "50.BMP"
- SAL_RESID_ICON_DEFAULT ICON sd.ico
+ SAL_RESID_ICON_DEFAULT ICON SD.ICO
--- vcl/util/makefile.mk.pristine 2009-04-04 19:55:53.764002766 +0200
+++ vcl/util/makefile.mk 2009-04-04 19:55:42.260224623 +0200
@@ -433,3 +259,4 @@
// -----------------------------------------------------------------------
+#endif /* !__MINGW32__ */
+
commit eadb9034dbbfe0d88f07ff43d55f99889f2584ba
Author: Jesús Corrius <jesus at softcatala.org>
Date: Thu Jul 2 12:43:33 2009 +0200
Ongoing work for crosscompile
* distro-configs/CrossWin32.conf.in:
* patches/dev300/apply:
* patches/dev300/crosswin32-bridges-mingw.diff:
* patches/dev300/crosswin32-dtrans-mingw.diff:
* patches/dev300/crosswin32-embedserv-mingw.diff:
* patches/dev300/crosswin32-extensions-mingw.diff:
* patches/dev300/crosswin32-hyphen-mingw.diff:
* patches/dev300/crosswin32-i18npool-cross.diff:
* patches/dev300/crosswin32-icc-cross.diff:
* patches/dev300/crosswin32-odk-cross.diff:
* patches/dev300/crosswin32-pyuno-mingw.diff:
* patches/dev300/crosswin32-sal-mingw-c.diff:
* patches/dev300/crosswin32-scp2-mingw.diff:
* patches/dev300/crosswin32-solenv-mingw.diff:
* patches/dev300/crosswin32-svtools-minimal.diff:
* patches/dev300/crosswin32-trans-mingw.diff:
* patches/dev300/crosswin32-ugly-hacks.diff:
* patches/dev300/crosswin32-vcl-mingw.diff:
diff --git a/distro-configs/CrossWin32.conf.in b/distro-configs/CrossWin32.conf.in
index fe065e3..8422f99 100644
--- a/distro-configs/CrossWin32.conf.in
+++ b/distro-configs/CrossWin32.conf.in
@@ -12,11 +12,17 @@
--with-system-boost
--with-sltport=no
--without-stlport
---with-system-python=no
+--with-system-python
--disable-ldap
--with-java=no
--disable-mozilla
--with-system-mozilla=no
--with-tools-dir=/home/jesus/soltools
--with-system-icu
---with-system-expat
\ No newline at end of file
+--with-system-expat
+--with-system-db
+--with-system-curl
+--with-system-hunspell
+--with-system-libwpd
+--with-system-neon
+--with-system-poppler
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e39d75b..8d08788 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3239,6 +3239,7 @@ oox-pptx-export-para-linespacing.diff, n#498737, rodo
# Experimental patches to crosscompile OOo for Win32
crosswin32-accessibility-nojava.diff
crosswin32-basegfx-no-cppunit.diff
+crosswin32-bridges-mingw.diff
crosswin32-config_office-cross.diff
crosswin32-config_office-mingw.diff
crosswin32-connectivity-mingw.diff
@@ -3248,18 +3249,21 @@ crosswin32-dbaccess-mingw.diff
crosswin32-desktop-mingw.diff
crosswin32-dtrans-mingw.diff
crosswin32-embeddedobj-mingw.diff
-#crosswin32-extensions-mingw.diff
+crosswin32-embedserv.mingw.diff
+crosswin32-extensions-mingw.diff
crosswin32-external-mingwheaders.diff
crosswin32-fpicker-mingw.diff
crosswin32-funit-char-line.diff
crosswin32-goodies-mingw.diff
crosswin32-helpcontent2-mingw.diff
+crosswin32-hyphen-mingw.diff
crosswin32-i18npool-cross.diff
crosswin32-i18npool-mingw.diff
crosswin32-icc-cross.diff
crosswin32-instsetoo_native-mingw.diff
crosswin32-lingucomponent-mingw.diff
crosswin32-o3tl-no-cppunit.diff
+crosswin32-odk-cross.diff
crosswin32-postprocess-mingw.diff
crosswin32-pyuno-mingw.diff
crosswin32-sal-cross.diff
@@ -3276,13 +3280,14 @@ crosswin32-solenv.diff
crosswin32-soltools-cross.diff
crosswin32-store-core.diff
crosswin32-store-registry.diff
-crosswin32-svtools-minimal.diff
crosswin32-svx-mingw.diff
crosswin32-sysui-mingw.diff
crosswin32-tools-mingw.diff
-#crosswin32-trans-mingw.diff
+crosswin32-trans-mingw.diff
crosswin32-unotools-mingw.diff
crosswin32-vcl-mingw.diff
+# things to fix later
+crosswin32-ugly-hacks.diff
[ Experimental ]
experimental_ooapi.diff, flr
diff --git a/patches/dev300/crosswin32-bridges-mingw.diff b/patches/dev300/crosswin32-bridges-mingw.diff
new file mode 100644
index 0000000..50514fb
--- /dev/null
+++ b/patches/dev300/crosswin32-bridges-mingw.diff
@@ -0,0 +1,276 @@
+--- bridges/source/cpp_uno/mingw_intel/except.cxx.orig 2009-06-28 16:52:19.000000000 +0200
++++ bridges/source/cpp_uno/mingw_intel/except.cxx 2009-06-28 16:56:26.000000000 +0200
+@@ -32,5 +32,6 @@
+ #include "precompiled_bridges.hxx"
+
+ #include <stdio.h>
++#include <string.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+
+--- bridges/source/cpp_uno/mingw_intel/call.s.orig 2009-06-28 16:58:39.000000000 +0200
++++ bridges/source/cpp_uno/mingw_intel/call.s 2009-06-29 13:08:00.000000000 +0200
+@@ -1,14 +1,11 @@
+ .text
+
+ .globl _privateSnippetExecutorGeneral
+- .type _privateSnippetExecutorGeneral, at function
++ .def _privateSnippetExecutorGeneral; .scl 2; .type 32; .endef
+ _privateSnippetExecutorGeneral:
+-.LFBg:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFIg0:
+ movl %esp,%ebp
+-.LCFIg1:
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
+ pushl %ecx # 32bit pCallStack
+@@ -18,18 +15,13 @@
+ movl 16(%esp),%eax # 32bit returnValue
+ leave
+ ret
+-.LFEg:
+- .size _privateSnippetExecutorGeneral,.-_privateSnippetExecutorGeneral
+
+ .globl _privateSnippetExecutorVoid
+- .type _privateSnippetExecutorVoid, at function
++ .def _privateSnippetExecutorVoid; .scl 2; .type 32; .endef
+ _privateSnippetExecutorVoid:
+-.LFBv:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFIv0:
+ movl %esp,%ebp
+-.LCFIv1:
+ pushl $0 # 32bit null pointer (returnValue not used)
+ pushl %ecx # 32bit pCallStack
+ pushl %edx # 32bit nVtableOffset
+@@ -37,18 +29,13 @@
+ call _cpp_vtable_call
+ leave
+ ret
+-.LFEv:
+- .size _privateSnippetExecutorVoid,.-_privateSnippetExecutorVoid
+
+ .globl _privateSnippetExecutorHyper
+- .type _privateSnippetExecutorHyper, at function
++ .def _privateSnippetExecutorHyper; .scl 2; .type 32; .endef
+ _privateSnippetExecutorHyper:
+-.LFBh:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFIh0:
+ movl %esp,%ebp
+-.LCFIh1:
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
+ pushl %ecx # 32bit pCallStack
+@@ -59,18 +46,13 @@
+ movl 20(%esp),%edx # 64bit returnValue, upper half
+ leave
+ ret
+-.LFEh:
+- .size _privateSnippetExecutorHyper,.-_privateSnippetExecutorHyper
+
+ .globl _privateSnippetExecutorFloat
+- .type _privateSnippetExecutorFloat, at function
++ .def _privateSnippetExecutorFloat; .scl 2; .type 32; .endef
+ _privateSnippetExecutorFloat:
+-.LFBf:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFIf0:
+ movl %esp,%ebp
+-.LCFIf1:
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
+ pushl %ecx # 32bit pCallStack
+@@ -80,18 +62,13 @@
+ flds 16(%esp) # 32bit returnValue
+ leave
+ ret
+-.LFEf:
+- .size _privateSnippetExecutorFloat,.-_privateSnippetExecutorFloat
+
+ .globl _privateSnippetExecutorDouble
+- .type _privateSnippetExecutorDouble, at function
++ .def _privateSnippetExecutorDouble; .scl 2; .type 32; .endef
+ _privateSnippetExecutorDouble:
+-.LFBd:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFId0:
+ movl %esp,%ebp
+-.LCFId1:
+ subl $0x8,%esp # 64bit returnValue
+ pushl %esp # 32bit &returnValue
+ pushl %ecx # 32bit pCallStack
+@@ -101,18 +78,13 @@
+ fldl 16(%esp) # 64bit returnValue
+ leave
+ ret
+-.LFEd:
+- .size _privateSnippetExecutorDouble,.-_privateSnippetExecutorDouble
+
+ .globl _privateSnippetExecutorClass
+- .type _privateSnippetExecutorClass, at function
++ .def _privateSnippetExecutorClass; .scl 2; .type 32; .endef
+ _privateSnippetExecutorClass:
+-.LFBc:
+ movl %esp,%ecx
+ pushl %ebp # proper stack frame needed for exception handling
+-.LCFIc0:
+ movl %esp,%ebp
+-.LCFIc1:
+ subl $0x4,%esp # 32bit returnValue
+ pushl %esp # 32bit &returnValue
+ pushl %ecx # 32bit pCallStack
+@@ -122,147 +94,3 @@
+ movl 16(%esp),%eax # 32bit returnValue
+ leave
+ ret $4
+-.LFEc:
+- .size _privateSnippetExecutorClass,.-_privateSnippetExecutorClass
+-
+- .section .eh_frame,"a", at progbits
+-.Lframe1:
+- .long .LECIE1-.LSCIE1 # length
+-.LSCIE1:
+- .long 0 # CIE_ID
+- .byte 1 # version
+- .string "zR" # augmentation
+- .uleb128 1 # code_alignment_factor
+- .sleb128 -4 # data_alignment_factor
+- .byte 8 # return_address_register
+- .uleb128 1 # augmentation size 1:
+- .byte 0x1B # FDE Encoding (pcrel sdata4)
+- # initial_instructions:
+- .byte 0x0C # DW_CFA_def_cfa %esp, 4
+- .uleb128 4
+- .uleb128 4
+- .byte 0x88 # DW_CFA_offset ret, 1
+- .uleb128 1
+- .align 4
+-.LECIE1:
+-.LSFDEg:
+- .long .LEFDEg-.LASFDEg # length
+-.LASFDEg:
+- .long .LASFDEg-.Lframe1 # CIE_pointer
+- .long .LFBg-. # initial_location
+- .long .LFEg-.LFBg # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIg0-.LFBg
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIg1-.LCFIg0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEg:
+-.LSFDEv:
+- .long .LEFDEv-.LASFDEv # length
+-.LASFDEv:
+- .long .LASFDEv-.Lframe1 # CIE_pointer
+- .long .LFBv-. # initial_location
+- .long .LFEv-.LFBv # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIv0-.LFBv
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIv1-.LCFIv0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEv:
+-.LSFDEh:
+- .long .LEFDEh-.LASFDEh # length
+-.LASFDEh:
+- .long .LASFDEh-.Lframe1 # CIE_pointer
+- .long .LFBh-. # initial_location
+- .long .LFEh-.LFBh # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIh0-.LFBh
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIh1-.LCFIh0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEh:
+-.LSFDEf:
+- .long .LEFDEf-.LASFDEf # length
+-.LASFDEf:
+- .long .LASFDEf-.Lframe1 # CIE_pointer
+- .long .LFBf-. # initial_location
+- .long .LFEf-.LFBf # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIf0-.LFBf
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIf1-.LCFIf0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEf:
+-.LSFDEd:
+- .long .LEFDEd-.LASFDEd # length
+-.LASFDEd:
+- .long .LASFDEd-.Lframe1 # CIE_pointer
+- .long .LFBd-. # initial_location
+- .long .LFEd-.LFBd # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFId0-.LFBd
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFId1-.LCFId0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEd:
+-.LSFDEc:
+- .long .LEFDEc-.LASFDEc # length
+-.LASFDEc:
+- .long .LASFDEc-.Lframe1 # CIE_pointer
+- .long .LFBc-. # initial_location
+- .long .LFEc-.LFBc # address_range
+- .uleb128 0 # augmentation size 0
+- # instructions:
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIc0-.LFBc
+- .byte 0x0E # DW_CFA_def_cfa_offset 8
+- .uleb128 8
+- .byte 0x85 # DW_CFA_offset %ebp, 2
+- .uleb128 2
+- .byte 0x04 # DW_CFA_advance_loc4
+- .long .LCFIc1-.LCFIc0
+- .byte 0x0D # DW_CFA_def_cfa_register %ebp
+- .uleb128 5
+- .align 4
+-.LEFDEc:
+- .section .note.GNU-stack,"", at progbits
diff --git a/patches/dev300/crosswin32-dtrans-mingw.diff b/patches/dev300/crosswin32-dtrans-mingw.diff
index e025ebf..765cd68 100644
--- a/patches/dev300/crosswin32-dtrans-mingw.diff
+++ b/patches/dev300/crosswin32-dtrans-mingw.diff
@@ -81,15 +81,137 @@
#pragma warning(push,1)
--- dtrans/source/win32/misc/ImplHelper.cxx.pristine 2008-10-29 17:18:03.000000000 +0100
+++ dtrans/source/win32/misc/ImplHelper.cxx 2008-10-29 17:20:12.000000000 +0100
-@@ -49,7 +49,7 @@
- #pragma warning(pop)
+@@ -49,6 +49,129 @@
#endif
#ifdef __MINGW32__
--#include <excpt.h>
-+#include <sehandler.h>
+ #include <excpt.h>
++#include <setjmp.h>
++#undef OPTIONAL
++#define OPTIONAL
++
++WINBASEAPI
++VOID
++WINAPI
++RtlUnwind (
++ IN PVOID TargetFrame OPTIONAL,
++ IN PVOID TargetIp OPTIONAL,
++ IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
++ IN PVOID ReturnValue
++ );
++
++// What library is this supposed to be defined in?
++#define RtlUnwind(a,b,c,d)
++
++class __SEHandler
++{
++ public:
++ __SEHandler() {}
++ ~__SEHandler() {}
++ typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
++ typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
++ typedef void (*PN)(void *);
++ void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
++ {
++ __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
++ m_pData=pdata;
++ switch (reinterpret_cast<int>(pfilter))
++ {
++ default:
++ m_filter=pfilter;
++ break;
++ case EXCEPTION_CONTINUE_EXECUTION:
++ m_filter=DefaultFilterContinueExecution;
++ break;
++ case EXCEPTION_EXECUTE_HANDLER:
++ m_filter=DefaultFilterExecuteHandler;
++ break;
++ case EXCEPTION_CONTINUE_SEARCH:
++ m_filter=DefaultFilterContinueSearch;
++ break;
++ }
++ if (phandlerbody)
++ m_handlerbody=phandlerbody;
++ else
++ m_handlerbody=DefaultHandler;
++ if (pfinal)
++ m_final=pfinal;
++ else
++ m_final=DefaultFinal;
++ m_ER.pHandlerClass = this;
++ m_ER.hp = handler;
++ asm("movl %%fs:0, %%eax\n\t"
++ "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
++ asm("movl %0, %%eax\n\t"
++ "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
++ }
++ void Reset()
++ {
++ m_final(m_pData);
++ asm("movl %0, %%eax \n\t"
++ "movl %%eax, %%fs:0"
++ : : "m" (m_ER.prev): "%eax");
++ }
++ private:
++ __SEHandler(const __SEHandler&);
++ __SEHandler& operator=(const __SEHandler&);
++ struct _ER {
++ _ER* prev;
++ PEXCEPTION_HANDLER hp;
++ __SEHandler *pHandlerClass;
++ };
++ static EXCEPTION_DISPOSITION handler(
++ struct _EXCEPTION_RECORD *pExceptionRecord,
++ void * EstablisherFrame,
++ struct _CONTEXT *ContextRecord,
++ void * /*DispatcherContext*/)
++ {
++ __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
++ if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
++ {
++ pThis->m_final(pThis->m_pData);
++ return ExceptionContinueSearch;
++ }
++ EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
++ switch ( pThis->m_filter(pThis->m_pData, &ep) )
++ {
++ case EXCEPTION_EXECUTE_HANDLER:
++ RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
++__set_label:
++ pThis->m_handlerbody(pThis->m_pData, &ep);
++ ContextRecord->Ebp = pThis->m_jmpbuf[0];
++ ContextRecord->Eip = pThis->m_jmpbuf[1];
++ ContextRecord->Esp = pThis->m_jmpbuf[2];
++ return ExceptionContinueExecution;
++ case EXCEPTION_CONTINUE_SEARCH:
++ return ExceptionContinueSearch;
++ case EXCEPTION_CONTINUE_EXECUTION:
++ return ExceptionContinueExecution;
++ }
++ return ExceptionContinueExecution;
++ }
++ static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
++ static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
++ static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
++ static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
++ static void DefaultFinal(void *) {}
++ typedef int (*handler_p)(
++ struct _EXCEPTION_RECORD *ExceptionRecord,
++ void * EstablisherFrame,
++ struct _CONTEXT *ContextRecord,
++ void * DispatcherContext);
++ _ER m_ER;
++ void *m_pData;
++ PN m_final;
++ PH m_handlerbody;
++ PF m_filter;
++ jmp_buf m_jmpbuf;
++};
++
++#undef OPTIONAL
#endif
//------------------------------------------------------------------------
+
--- dtrans/source/win32/workbench/test_wincb.cxx.pristine 2008-10-29 20:36:59.000000000 +0100
+++ dtrans/source/win32/workbench/test_wincb.cxx 2008-10-29 20:30:06.000000000 +0100
@@ -37,7 +37,7 @@
diff --git a/patches/dev300/crosswin32-embedserv-mingw.diff b/patches/dev300/crosswin32-embedserv-mingw.diff
new file mode 100644
index 0000000..008d100
--- /dev/null
+++ b/patches/dev300/crosswin32-embedserv-mingw.diff
@@ -0,0 +1,23 @@
+--- embedserv/source/inprocserv/makefile.mk.orig 2009-06-30 17:42:56.000000000 +0200
++++ embedserv/source/inprocservmakefile.mk 2009-06-30 17:46:33.000000000 +0200
+@@ -57,12 +57,19 @@
+ $(SLO)$/inprocembobj.obj
+
+ SHL1TARGET=$(TARGET)
++.IF "$(COM)"=="GCC"
++SHL1STDLIBS=\
++ -luuid\
++ -lole32\
++ -lgdi32\
++ -ladvapi32
++.ELSE
+ SHL1STDLIBS=\
+ uuid.lib\
+ ole32.lib\
+ gdi32.lib\
+ advapi32.lib
+-
++.ENDIF
+ SHL1OBJS=$(SLOFILES)
+
+ SHL1DEF=$(MISC)$/$(TARGET).def
diff --git a/patches/dev300/crosswin32-extensions-mingw.diff b/patches/dev300/crosswin32-extensions-mingw.diff
new file mode 100644
index 0000000..e69de29
diff --git a/patches/dev300/crosswin32-hyphen-mingw.diff b/patches/dev300/crosswin32-hyphen-mingw.diff
new file mode 100644
index 0000000..fdc1f95
--- /dev/null
+++ b/patches/dev300/crosswin32-hyphen-mingw.diff
@@ -0,0 +1,11 @@
+--- hyphen/makefile.mk.orig 2009-06-27 18:06:28.000000000 +0200
++++ hyphen/makefile.mk 2009-06-27 18:10:45.000000000 +0200
+@@ -84,7 +84,7 @@
+
+ .IF "$(GUI)"=="WNT"
+ .IF "$(COM)"=="GCC"
+-CONFIGURE_ACTION=configure
++CONFIGURE_ACTION=mingw32-configure
+ CONFIGURE_FLAGS= --disable-shared --with-pic
+
+ BUILD_ACTION=make
diff --git a/patches/dev300/crosswin32-i18npool-cross.diff b/patches/dev300/crosswin32-i18npool-cross.diff
index dccd2d9..68bf4cb 100644
--- a/patches/dev300/crosswin32-i18npool-cross.diff
+++ b/patches/dev300/crosswin32-i18npool-cross.diff
@@ -9,7 +9,7 @@ i18npool/source/textconversion/data/makefile.mk
+.IF "$(CROSS_COMPILING)" == "no"
+GENCONV_DICT = $(BIN)$/genconv_dict$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENCONV_DICT = $(OOO_TOOLS_DIR)/genconv_dict
++GENCONV_DICT = $(TOOLS_DIR)/genconv_dict
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/%.cxx : %.dic
@@ -30,7 +30,7 @@ i18npool/source/localedata/data/makefile.mk
+.IF "$(CROSS_COMPILING)" == "no"
+SAXPARSER = $(BIN)$/saxparser$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+SAXPARSER = $(OOO_TOOLS_DIR)/saxparser
++SAXPARSER = $(TOOLS_DIR)/saxparser
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/localedata_%.cxx : %.xml
@@ -48,7 +48,7 @@ i18npool/source/collator/data/makefile.mk
+.IF "$(CROSS_COMPILING)" == "no"
+GENCOLL_RULE = $(BIN)$/gencoll_rule$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENCOLL_RULE = $(OOO_TOOLS_DIR)/gencoll_rule
++GENCOLL_RULE = $(TOOLS_DIR)/gencoll_rule
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/collator_%.cxx : %.txt
@@ -69,7 +69,7 @@ i18npool/source/indexentry/data/makefile.mk
+.IF "$(CROSS_COMPILING)" == "no"
+GENINDEX_DATA = $(BIN)$/genindex_data$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENINDEX_DATA = $(OOO_TOOLS_DIR)/genindex_data
++GENINDEX_DATA = $(TOOLS_DIR)/genindex_data
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/%.cxx : %.txt
@@ -90,7 +90,7 @@ i18npool/source/breakiterator/data/makefile.mk
+.IF "$(CROSS_COMPILING)" == "no"
+GENDICT = $(BIN)$/gendict$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENDICT = $(OOO_TOOLS_DIR)/gendict
++GENDICT = $(TOOLS_DIR)/gendict
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/dict_%.cxx : %.dic
diff --git a/patches/dev300/crosswin32-icc-cross.diff b/patches/dev300/crosswin32-icc-cross.diff
index 7618ba3..51e4de1 100644
--- a/patches/dev300/crosswin32-icc-cross.diff
+++ b/patches/dev300/crosswin32-icc-cross.diff
@@ -1,15 +1,15 @@
--- icc/makefile.mk.orig 2009-06-25 12:18:15.000000000 +0200
+++ icc/makefile.mk 2009-06-25 12:21:09.000000000 +0200
-@@ -55,7 +55,13 @@
+@@ -55,7 +55,12 @@
Contrib$/ICC_utils$/Vetters.cpp
CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
-+
+-BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
+.IF "$(CROSS_COMPILING)" == "no"
+BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
+.ELSE
+# FIXME: should use CC_FOR_BUILD to build the thing here
- BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
++BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(TOOLS_DIR)/create_sRGB_profile
+.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/patches/dev300/crosswin32-odk-cross.diff b/patches/dev300/crosswin32-odk-cross.diff
new file mode 100644
index 0000000..fa0fb2b
--- /dev/null
+++ b/patches/dev300/crosswin32-odk-cross.diff
@@ -0,0 +1,23 @@
+--- odk/pack/copying/makefile.mk.orig 2008-12-11 15:10:39.000000000 +0100
++++ odk/pack/copying/makefile.mk 2009-06-30 21:13:04.000000000 +0200
+@@ -249,7 +249,7 @@
+
+ $(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
+ -$(MKDIRHIER) $(@:d)
+- $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" -sincefile $(IDL_SINCE_TAGS) -name $(IDLDOCREFNAME) -lg \
++ $(TOOLS_DIR)/autodoc -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" -sincefile $(IDL_SINCE_TAGS) -name $(IDLDOCREFNAME) -lg \
+ idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL)
+ -rm $(@:d)$/idl.css
+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/common$/ref$/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/idl.css
+
+--- odk/pack/gendocu/makefile.mk.orig 2008-10-01 12:04:58.000000000 +0200
++++ odk/pack/gendocu/makefile.mk 2009-06-30 21:15:47.000000000 +0200
+@@ -85,7 +85,7 @@
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
+-MY_AUTODOC=$(SOLARBINDIR)$/autodoc
++MY_AUTODOC=$(TOOLS_DIR)$/autodoc
+
+ .IF "$(SOLAR_JAVA)"!=""
+ all: \
diff --git a/patches/dev300/crosswin32-pyuno-mingw.diff b/patches/dev300/crosswin32-pyuno-mingw.diff
index 46068ce..ed91ed8 100644
--- a/patches/dev300/crosswin32-pyuno-mingw.diff
+++ b/patches/dev300/crosswin32-pyuno-mingw.diff
@@ -8,3 +8,13 @@
.INCLUDE : pyversion.mk
PYUNORC=pyuno.ini
.ENDIF
+@@ -118,7 +119,7 @@
+ $(LB)$/lib$(TARGET).a
+
+ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
+- dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
++ $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
+ .ELSE
+ ALLTAR : \
+ $(DLLDEST)$/uno.py
+
diff --git a/patches/dev300/crosswin32-sal-mingw-c.diff b/patches/dev300/crosswin32-sal-mingw-c.diff
index b220991..f56cb9b 100644
--- a/patches/dev300/crosswin32-sal-mingw-c.diff
+++ b/patches/dev300/crosswin32-sal-mingw-c.diff
@@ -60,20 +60,143 @@
DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) )
DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) )
DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) )
---- onlinecheck.cxx 10 apr 2008 14:11:15 +0200 1.8
+--- sal/systools/win32/onlineupdate/onlinecheck.cxx.orig 10 apr 2008 14:11:15 +0200 1.8
+++ sal/systools/win32/onlineupdate/onlinecheck.cxx 22 okt 2008 10:56:53 +0200
-@@ -45,8 +45,8 @@
- #endif
+@@ -46,6 +46,134 @@
#include <tchar.h>
#ifdef __MINGW32__
--#include <excpt.h>
--#endif
-+#include <sehandler.h>
-+#endif /* __MINGW32__ */
+ #include <excpt.h>
++#include <setjmp.h>
++
++// not implemented in mingw, only in wine...
++//BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD);
++#define InternetGetConnectedStateEx(a,b,c,d) InternetGetConnectedState(a,c)
++
++#undef OPTIONAL
++#define OPTIONAL
++
++WINBASEAPI
++VOID
++WINAPI
++RtlUnwind (
++ IN PVOID TargetFrame OPTIONAL,
++ IN PVOID TargetIp OPTIONAL,
++ IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
++ IN PVOID ReturnValue
++ );
++
++// What library is this supposed to be defined in?
++#define RtlUnwind(a,b,c,d)
++
++class __SEHandler
++{
++ public:
++ __SEHandler() {}
++ ~__SEHandler() {}
++ typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
++ typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
++ typedef void (*PN)(void *);
++ void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
++ {
++ __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
++ m_pData=pdata;
++ switch (reinterpret_cast<int>(pfilter))
++ {
++ default:
++ m_filter=pfilter;
++ break;
++ case EXCEPTION_CONTINUE_EXECUTION:
++ m_filter=DefaultFilterContinueExecution;
++ break;
++ case EXCEPTION_EXECUTE_HANDLER:
++ m_filter=DefaultFilterExecuteHandler;
++ break;
++ case EXCEPTION_CONTINUE_SEARCH:
++ m_filter=DefaultFilterContinueSearch;
++ break;
++ }
++ if (phandlerbody)
++ m_handlerbody=phandlerbody;
++ else
++ m_handlerbody=DefaultHandler;
++ if (pfinal)
++ m_final=pfinal;
++ else
++ m_final=DefaultFinal;
++ m_ER.pHandlerClass = this;
++ m_ER.hp = handler;
++ asm("movl %%fs:0, %%eax\n\t"
++ "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
++ asm("movl %0, %%eax\n\t"
++ "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
++ }
++ void Reset()
++ {
++ m_final(m_pData);
++ asm("movl %0, %%eax \n\t"
++ "movl %%eax, %%fs:0"
++ : : "m" (m_ER.prev): "%eax");
++ }
++ private:
++ __SEHandler(const __SEHandler&);
++ __SEHandler& operator=(const __SEHandler&);
++ struct _ER {
++ _ER* prev;
++ PEXCEPTION_HANDLER hp;
++ __SEHandler *pHandlerClass;
++ };
++ static EXCEPTION_DISPOSITION handler(
++ struct _EXCEPTION_RECORD *pExceptionRecord,
++ void * EstablisherFrame,
++ struct _CONTEXT *ContextRecord,
++ void * /*DispatcherContext*/)
++ {
++ __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
++ if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
++ {
++ pThis->m_final(pThis->m_pData);
++ return ExceptionContinueSearch;
++ }
++ EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
++ switch ( pThis->m_filter(pThis->m_pData, &ep) )
++ {
++ case EXCEPTION_EXECUTE_HANDLER:
++ RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
++__set_label:
++ pThis->m_handlerbody(pThis->m_pData, &ep);
++ ContextRecord->Ebp = pThis->m_jmpbuf[0];
++ ContextRecord->Eip = pThis->m_jmpbuf[1];
++ ContextRecord->Esp = pThis->m_jmpbuf[2];
++ return ExceptionContinueExecution;
++ case EXCEPTION_CONTINUE_SEARCH:
++ return ExceptionContinueSearch;
++ case EXCEPTION_CONTINUE_EXECUTION:
++ return ExceptionContinueExecution;
++ }
++ return ExceptionContinueExecution;
++ }
++ static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
++ static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
++ static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
++ static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
++ static void DefaultFinal(void *) {}
++ typedef int (*handler_p)(
++ struct _EXCEPTION_RECORD *ExceptionRecord,
++ void * EstablisherFrame,
++ struct _CONTEXT *ContextRecord,
++ void * DispatcherContext);
++ _ER m_ER;
++ void *m_pData;
++ PN m_final;
++ PH m_handlerbody;
++ PF m_filter;
++ jmp_buf m_jmpbuf;
++};
++
++#undef OPTIONAL
+ #endif
#define elementsof(a) (sizeof(a)/sizeof((a)[0]))
-
-diff -purN sal/systools/win32/uwinapi/FindFirstVolumeA.cpp sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
--- sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:23:37.935495274 +0200
+++ sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:21:51.303494448 +0200
@@ -30,4 +30,4 @@
diff --git a/patches/dev300/crosswin32-scp2-mingw.diff b/patches/dev300/crosswin32-scp2-mingw.diff
index 99701cd..ea735b1 100644
--- a/patches/dev300/crosswin32-scp2-mingw.diff
+++ b/patches/dev300/crosswin32-scp2-mingw.diff
@@ -223,9 +223,9 @@ scp2/source/ooo/windowscustomaction_ooo.scp.pristine
Name = "MigrateInstallPath";
Typ = "321";
@@ -417,3 +422,4 @@
- Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
+ Inbinarytable = 1;
+ Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
End
-
+#endif /* !__CROSS__ */
scp2/source/ooo/scpaction_ooo.scp.pristine
--- scp2/source/ooo/scpaction_ooo.scp.pristine 2008-04-15 16:49:29.000000000 +0200
diff --git a/patches/dev300/crosswin32-solenv-mingw.diff b/patches/dev300/crosswin32-solenv-mingw.diff
index da91e84..325a018 100644
--- a/patches/dev300/crosswin32-solenv-mingw.diff
+++ b/patches/dev300/crosswin32-solenv-mingw.diff
@@ -16,7 +16,7 @@
AFLAGS=/c /Cp /coff
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+ASM=$(NASM)
-+REGCOMP:=wine $(SOLARBINDIR)/regcomp
++REGCOMP:=$(SOLARBINDIR)/regcomp
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
# architecture dependent flags for the C and C++ compiler that can be changed by
@@ -322,3 +322,718 @@
--dllname $(SHL1TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -815,7 +819,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL2DEFAULTRES:b).rc -o $(MISC)$/$(SHL2DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL2DEFAULTRES)"!=""
+ .IF "$(SHL2ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -823,18 +831,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL2LINKRES) $(SHL2LINKRESO)
++ $(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL2ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB2NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL2DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL2DEF) \
+ --dllname $(SHL2TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ .ELSE # "$(DEFLIB2NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL2DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL2DEF) \
+ --dllname $(SHL2TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -1355,7 +1363,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL3DEFAULTRES:b).rc -o $(MISC)$/$(SHL3DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL3DEFAULTRES)"!=""
+ .IF "$(SHL3ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -1363,18 +1375,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL3LINKRES) $(SHL3LINKRESO)
++ $(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL3ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB3NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL3DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL3DEF) \
+ --dllname $(SHL3TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ .ELSE # "$(DEFLIB3NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL3DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL3DEF) \
+ --dllname $(SHL3TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -1895,7 +1907,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL4DEFAULTRES:b).rc -o $(MISC)$/$(SHL4DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL4DEFAULTRES)"!=""
+ .IF "$(SHL4ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -1903,18 +1919,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL4LINKRES) $(SHL4LINKRESO)
++ $(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL4ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB4NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL4DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL4DEF) \
+ --dllname $(SHL4TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ .ELSE # "$(DEFLIB4NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL4DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL4DEF) \
+ --dllname $(SHL4TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -2435,7 +2451,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL5DEFAULTRES:b).rc -o $(MISC)$/$(SHL5DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL5DEFAULTRES)"!=""
+ .IF "$(SHL5ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -2443,18 +2463,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL5LINKRES) $(SHL5LINKRESO)
++ $(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL5ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB5NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL5DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL5DEF) \
+ --dllname $(SHL5TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ .ELSE # "$(DEFLIB5NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL5DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL5DEF) \
+ --dllname $(SHL5TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -2975,7 +2995,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL6DEFAULTRES:b).rc -o $(MISC)$/$(SHL6DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL6DEFAULTRES)"!=""
+ .IF "$(SHL6ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -2983,18 +3007,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL6LINKRES) $(SHL6LINKRESO)
++ $(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL6ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB6NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL6DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL6DEF) \
+ --dllname $(SHL6TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ .ELSE # "$(DEFLIB6NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL6DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL6DEF) \
+ --dllname $(SHL6TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -3515,7 +3539,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL7DEFAULTRES:b).rc -o $(MISC)$/$(SHL7DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL7DEFAULTRES)"!=""
+ .IF "$(SHL7ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -3523,18 +3551,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL7LINKRES) $(SHL7LINKRESO)
++ $(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL7ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB7NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL7DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL7DEF) \
+ --dllname $(SHL7TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ .ELSE # "$(DEFLIB7NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL7DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL7DEF) \
+ --dllname $(SHL7TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -4055,7 +4083,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL8DEFAULTRES:b).rc -o $(MISC)$/$(SHL8DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL8DEFAULTRES)"!=""
+ .IF "$(SHL8ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -4063,18 +4095,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL8LINKRES) $(SHL8LINKRESO)
++ $(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL8ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB8NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL8DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL8DEF) \
+ --dllname $(SHL8TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ .ELSE # "$(DEFLIB8NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL8DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL8DEF) \
+ --dllname $(SHL8TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -4595,7 +4627,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL9DEFAULTRES:b).rc -o $(MISC)$/$(SHL9DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL9DEFAULTRES)"!=""
+ .IF "$(SHL9ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -4603,18 +4639,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL9LINKRES) $(SHL9LINKRESO)
++ $(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL9ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB9NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL9DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL9DEF) \
+ --dllname $(SHL9TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ .ELSE # "$(DEFLIB9NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL9DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL9DEF) \
+ --dllname $(SHL9TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+@@ -5135,7 +5171,11 @@
+ @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ENDIF # "$(use_shl_versions)" != ""
++.IF "$(CROSS_COMPILING)" == "no"
+ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
++.ELSE # "$(CROSS_COMPILING)" == "yes"
++ $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) -i $(MISC)$/$(SHL10DEFAULTRES:b).rc -o $(MISC)$/$(SHL10DEFAULTRES:b).res
++.ENDIF # "$(CROSS_COMPILING)" == "yes"
+ .ENDIF # "$(SHL10DEFAULTRES)"!=""
+ .IF "$(SHL10ALLRES)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+@@ -5143,18 +5183,18 @@
+ .ELSE # "$(USE_SHELL)"=="4nt"
+ $(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
+ .IF "$(COM)"=="GCC"
+- windres $(SHL10LINKRES) $(SHL10LINKRESO)
++ $(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
+ .ENDIF # "$(COM)"=="GCC"
+ .ENDIF # "$(USE_SHELL)"=="4nt"
+ .ENDIF # "$(SHL10ALLRES)"!=""
+ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+ .IF "$(DEFLIB10NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL10DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL10DEF) \
+ --dllname $(SHL10TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ .ELSE # "$(DEFLIB10NAME)"!="" # do not have to include objs
+- @echo dlltool --input-def $(SHL10DEF) \
++ @echo $(DLLTOOL) --input-def $(SHL10DEF) \
+ --dllname $(SHL10TARGET)$(DLLPOST) \
+ --kill-at \
+ --output-exp $(MISC)$/$(@:b)_exp.o \
+
+--- solenv/inc/_tg_def.mk.orig 2009-06-27 01:53:16.000000000 +0200
++++ solenv/inc/_tg_def.mk 2009-06-27 01:55:08.000000000 +0200
+@@ -29,10 +29,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL1OBJS)"!=""
+- -echo $(foreach,i,$(SHL1OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL1OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL1LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -80,7 +80,7 @@
+ .IF "$(DEFLIB1NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL1TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL1TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL1TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL1TARGET).exp
+@@ -313,10 +313,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL2OBJS)"!=""
+- -echo $(foreach,i,$(SHL2OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL2OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL2LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -364,7 +364,7 @@
+ .IF "$(DEFLIB2NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL2TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL2TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL2TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL2TARGET).exp
+@@ -597,10 +597,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL3OBJS)"!=""
+- -echo $(foreach,i,$(SHL3OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL3OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL3LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -648,7 +648,7 @@
+ .IF "$(DEFLIB3NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL3TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL3TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL3TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL3TARGET).exp
+@@ -881,10 +881,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL4OBJS)"!=""
+- -echo $(foreach,i,$(SHL4OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL4OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL4LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -932,7 +932,7 @@
+ .IF "$(DEFLIB4NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL4TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL4TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL4TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL4TARGET).exp
+@@ -1165,10 +1165,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL5OBJS)"!=""
+- -echo $(foreach,i,$(SHL5OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL5OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL5LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -1216,7 +1216,7 @@
+ .IF "$(DEFLIB5NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL5TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL5TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL5TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL5TARGET).exp
+@@ -1449,10 +1449,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL6OBJS)"!=""
+- -echo $(foreach,i,$(SHL6OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL6OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL6LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -1500,7 +1500,7 @@
+ .IF "$(DEFLIB6NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL6TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL6TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL6TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL6TARGET).exp
+@@ -1733,10 +1733,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL7OBJS)"!=""
+- -echo $(foreach,i,$(SHL7OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL7OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL7LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -1784,7 +1784,7 @@
+ .IF "$(DEFLIB7NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL7TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL7TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL7TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL7TARGET).exp
+@@ -2017,10 +2017,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL8OBJS)"!=""
+- -echo $(foreach,i,$(SHL8OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL8OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL8LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -2068,7 +2068,7 @@
+ .IF "$(DEFLIB8NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL8TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL8TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL8TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL8TARGET).exp
+@@ -2301,10 +2301,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL9OBJS)"!=""
+- -echo $(foreach,i,$(SHL9OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL9OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL9LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -2352,7 +2352,7 @@
+ .IF "$(DEFLIB9NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL9TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL9TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL9TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL9TARGET).exp
+@@ -2585,10 +2585,10 @@
+ # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
+ # Extract RTTI symbols from all the objects that will be used to build a shared library
+ .IF "$(SHL10OBJS)"!=""
+- -echo $(foreach,i,$(SHL10OBJS) $i) | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -echo $(foreach,i,$(SHL10OBJS) $i) | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ .IF "$(SHL10LIBS)"!=""
+- -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
++ -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 $(NM) -gP | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
+ .ENDIF
+ # overwrite the map file generate into the local output tree with the generated
+ # exported symbols list
+@@ -2636,7 +2636,7 @@
+ .IF "$(DEFLIB10NAME)"!=""
+ .IF "$(COM)"=="GCC"
+ @-$(RM) $(MISC)$/$(SHL10TARGET).exp
+- dlltool --output-def $(MISC)$/$(SHL10TARGET).exp --export-all-symbols \
++ $(DLLTOOL) --output-def $(MISC)$/$(SHL10TARGET).exp --export-all-symbols \
+ `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
+ tail --lines +3 $(MISC)$/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
+ @-$(RM) $(MISC)$/$(SHL10TARGET).exp
+
+--- solenv/inc/_tg_lib.mk.orig 2009-06-28 00:43:24.000000000 +0200
++++ solenv/inc/_tg_lib.mk 2009-06-28 00:44:42.000000000 +0200
+@@ -27,7 +27,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
+- @+echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB1ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB1ARCHIV:b).cmd
+ .ELSE
+@@ -120,7 +120,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
+- @+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB2ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB2ARCHIV:b).cmd
+ .ELSE
+@@ -213,7 +213,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
+- @+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB3ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB3ARCHIV:b).cmd
+ .ELSE
+@@ -306,7 +306,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
+- @+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB4ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB4ARCHIV:b).cmd
+ .ELSE
+@@ -399,7 +399,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
+- @+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB5ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB5ARCHIV:b).cmd
+ .ELSE
+@@ -492,7 +492,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
+- @+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB6ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB6ARCHIV:b).cmd
+ .ELSE
+@@ -585,7 +585,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
+- @+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB7ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB7ARCHIV:b).cmd
+ .ELSE
+@@ -678,7 +678,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
+- @+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB8ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB8ARCHIV:b).cmd
+ .ELSE
+@@ -771,7 +771,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
+- @+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB9ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB9ARCHIV:b).cmd
+ .ELSE
+@@ -864,7 +864,7 @@
+ .IF "$(GUI)$(COM)"=="WNTGCC"
+ @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
+ @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
+- @+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
++ @+echo $(RANLIB) $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
+ @cat $(MISC)$/$(LIB10ARCHIV:b).cmd
+ @+source $(MISC)$/$(LIB10ARCHIV:b).cmd
+ .ELSE
+
+--- solenv/inc/_tg_app.mk.orig 2009-06-30 12:17:02.000000000 +0200
++++ solenv/inc/_tg_app.mk 2009-06-30 12:17:50.000000000 +0200
+@@ -142,7 +142,7 @@
+ @echo mingw
+ .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
+ @cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP1RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP1RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
+@@ -426,7 +426,7 @@
+ @echo mingw
+ .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
+ @cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP2RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP2RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
+@@ -710,7 +710,7 @@
+ @echo mingw
+ .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
+ @cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP3RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP3RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
+@@ -994,7 +994,7 @@
+ @echo mingw
+ .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
+ @cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP4RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP4RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
+@@ -1278,7 +1278,7 @@
+ @echo mingw
+ .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
+ @cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP5RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP5RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
+@@ -1562,7 +1562,7 @@
+ @echo mingw
+ .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
+ @cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP6RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP6RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
+@@ -1846,7 +1846,7 @@
+ @echo mingw
+ .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
+ @cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP7RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP7RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
+@@ -2130,7 +2130,7 @@
+ @echo mingw
+ .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
+ @cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP8RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP8RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
+@@ -2414,7 +2414,7 @@
+ @echo mingw
+ .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
+ @cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP9RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP9RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
+@@ -2698,7 +2698,7 @@
+ @echo mingw
+ .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
+ @cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.res
+- windres $(MISC)$/$(@:b)_all.res $(APP10RESO)
++ $(WINDRES) $(MISC)$/$(@:b)_all.res $(APP10RESO)
+ .ENDIF
+ @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+ $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
diff --git a/patches/dev300/crosswin32-svtools-minimal.diff b/patches/dev300/crosswin32-svtools-minimal.diff
deleted file mode 100644
index cb648c1..0000000
--- a/patches/dev300/crosswin32-svtools-minimal.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- ./svtools/prj/build.lst.orig 2009-04-22 10:45:50.410216382 +0200
-+++ ./svtools/prj/build.lst 2009-04-22 10:50:17.342826747 +0200
-@@ -9,46 +9,46 @@ st svtools\win\res get - all st_wres
- st svtools\os2\inc get - all st_oinc NULL
- st svtools\mac\inc get - all st_minc NULL
- st svtools\unx\inc get - all st_uinc NULL
--st svtools\bmpmaker nmake - all st_bmp st_inc NULL
-+#st svtools\bmpmaker nmake - all st_bmp st_inc NULL
- st svtools\source\memtools nmake - all st_mem st_inc NULL
--st svtools\source\numbers nmake - all st_num st_inc NULL
-+#st svtools\source\numbers nmake - all st_num st_inc NULL
- st svtools\source\notify nmake - all st_not st_inc NULL
- st svtools\source\config nmake - all st_conf st_inc NULL
--st svtools\unx\source\svdde nmake - u st_usdde st_inc NULL
--st svtools\unx\source\svdde nmake - p st_psdde st_inc NULL
--st svtools\mac\source\svdde nmake - m st_msdde st_inc NULL
--st svtools\mac\source\misc nmake - m st_msc st_inc NULL
--st svtools\source\control nmake - all st_ctl st_inc NULL
-+#st svtools\unx\source\svdde nmake - u st_usdde st_inc NULL
-+#st svtools\unx\source\svdde nmake - p st_psdde st_inc NULL
-+#st svtools\mac\source\svdde nmake - m st_msdde st_inc NULL
-+#st svtools\mac\source\misc nmake - m st_msc st_inc NULL
-+#st svtools\source\control nmake - all st_ctl st_inc NULL
- st svtools\source\filerec nmake - all st_file st_inc NULL
--st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL
--st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL
--st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL
--st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL
--st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL
--st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL
--st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL
--st svtools\source\urlobj nmake - all st__url st_inc NULL
--st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL
-+#st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL
-+#st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL
-+#st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL
-+#st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL
-+#st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL
-+#st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL
-+#st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL
-+#st svtools\source\urlobj nmake - all st__url st_inc NULL
-+#st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL
- st svtools\source\misc1 nmake - all st__misc1 st_inc NULL
--st svtools\source\contnr nmake - all st__ctr st_inc NULL
--st svtools\source\svdde nmake - all st__dde st_inc NULL
--st svtools\source\items nmake - all st__item st_inc NULL
-+#st svtools\source\contnr nmake - all st__ctr st_inc NULL
-+#st svtools\source\svdde nmake - all st__dde st_inc NULL
-+#st svtools\source\items nmake - all st__item st_inc NULL
- st svtools\source\items1 nmake - all st__item1 st_inc NULL
--st svtools\source\undo nmake - all st_undo st_inc NULL
--st svtools\source\plugapp nmake - all st_papp st_inc NULL
--st svtools\source\dialogs nmake - all st_dial st_inc NULL
--st svtools\source\edit nmake - all st_edit st_inc NULL
--st svtools\source\uno nmake - all st_uno st_inc NULL
--st svtools\source\svrtf nmake - all st_rtf st_inc NULL
-+#st svtools\source\undo nmake - all st_undo st_inc NULL
-+#st svtools\source\plugapp nmake - all st_papp st_inc NULL
-+#st svtools\source\dialogs nmake - all st_dial st_inc NULL
-+#st svtools\source\edit nmake - all st_edit st_inc NULL
-+#st svtools\source\uno nmake - all st_uno st_inc NULL
-+#st svtools\source\svrtf nmake - all st_rtf st_inc NULL
- st svtools\source\svsql nmake - all st_sql st_inc NULL
--st svtools\source\svhtml nmake - all st_html st_inc NULL
--st svtools\source\syslocale nmake - all st_sysloc st_inc NULL
-+#st svtools\source\svhtml nmake - all st_html st_inc NULL
-+#st svtools\source\syslocale nmake - all st_sysloc st_inc NULL
- st svtools\source\filepicker nmake - all st_filepick st_inc NULL
--st svtools\util nmake - all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL
--st svtools\source\fsstor nmake - all st_fsstor st_inc NULL
--st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL
--st svtools\source\passwordcontainer nmake - all st_passcont st_inc NULL
--st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL
--st svtools\uno nmake - all st_svtuno st_util st_inc NULL
--st svtools\source\java nmake - all st_svtjava st_inc NULL
--st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL
-+#st svtools\util nmake - all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL
-+#st svtools\source\fsstor nmake - all st_fsstor st_inc NULL
-+#st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL
-+#st svtools\source\passwordcontainer nmake - all st_passcont st_inc NULL
-+#st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL
-+#st svtools\uno nmake - all st_svtuno st_util st_inc NULL
-+#st svtools\source\java nmake - all st_svtjava st_inc NULL
-+#st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL
diff --git a/patches/dev300/crosswin32-trans-mingw.diff b/patches/dev300/crosswin32-trans-mingw.diff
new file mode 100644
index 0000000..e69de29
diff --git a/patches/dev300/crosswin32-ugly-hacks.diff b/patches/dev300/crosswin32-ugly-hacks.diff
new file mode 100644
index 0000000..53af32b
--- /dev/null
+++ b/patches/dev300/crosswin32-ugly-hacks.diff
@@ -0,0 +1,53 @@
+--- configure.in.pristine 2009-06-27 21:35:39.000000000 +0200
++++ configure.in 2009-06-27 21:47:57.000000000 +0200
+@@ -3612,8 +3612,8 @@
+ AC_MSG_RESULT([external])
+ AM_PATH_PYTHON([2.2])
+
+- PYTHON_CFLAGS=`python-config --cflags`
+- PYTHON_LIBS=`python-config --libs`
++ PYTHON_CFLAGS="-I/usr/i686-pc-mingw32/sys-root/mingw/include/python2.6 -DNDEBUG -O2 -Wall"
++ PYTHON_LIBS="-lpython2.6"
+
+ if test "$_os" = "Darwin"; then
+ PYTHON_LIBS="-framework Python"
+@@ -3655,25 +3655,26 @@
+ test "$with_system_db" != "no"; then
+ SYSTEM_DB=YES
+ AC_MSG_RESULT([external])
+- AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
++ AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/i686-pc-mingw32/sys-root/mingw/include ],
+ [
+- CFLAGS=-I/usr/include/db4
+- AC_CHECK_HEADER(db4/db.h,
+- [ DB_INCLUDES=/usr/include/db4 ],
++ CFLAGS=-I/usr/i686-pc-mingw32/sys-root/mingw/include
++ AC_CHECK_HEADER(db.h,
++ [ DB_INCLUDES=//usr/i686-pc-mingw32/sys-root/mingw/include ],
+ [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
+ ], []
+ )
+ AC_MSG_CHECKING([whether db is at least 4.1])
+- for v in `seq 1 7`; do
+- AC_TRY_RUN([
+-#include <db.h>
++ #for v in `seq 1 7`; do
++ # AC_TRY_RUN([
++##include <db.h>
+
+-int main(int argc, char **argv) {
+- if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+- else return 1;
+-}
+- ], [DB_VERSION_MINOR=$v], [], [DB_VERSION_MINOR=$ac_cv_db_version_minor])
+- done
++#int main(int argc, char **argv) {
++# if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
++# else return 1;
++#}
++# ], [DB_VERSION_MINOR=$v], [], [DB_VERSION_MINOR=$ac_cv_db_version_minor])
++# done
++ DB_VERSION_MINOR=7
+ if test "$DB_VERSION_MINOR" -gt "1"; then
+ AC_MSG_RESULT([OK])
+ DB_VERSION=4.$DB_VERSION_MINOR
diff --git a/patches/dev300/crosswin32-vcl-mingw.diff b/patches/dev300/crosswin32-vcl-mingw.diff
index 3a540cc..ebe4f5c 100644
--- a/patches/dev300/crosswin32-vcl-mingw.diff
+++ b/patches/dev300/crosswin32-vcl-mingw.diff
@@ -375,6 +375,17 @@
+#endif /* __MINGW32__ */
WinSalFrame* pFrame = GetWindowPtr( hWnd );
Window *pWindow = pFrame ? pFrame->GetWindow() : NULL;
+
+--- vcl/win/source/src/salsrc.rc.orig 2009-07-01 12:26:36.000000000 +0200
++++ vcl/win/source/src/salsrc.rc 2009-07-01 13:25:14.000000000 +0200
+@@ -119,6 +119,6 @@
+ SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
+ SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
+
+-SAL_RESID_BITMAP_50 BITMAP 50.bmp
++SAL_RESID_BITMAP_50 BITMAP "50.bmp"
+
+ SAL_RESID_ICON_DEFAULT ICON sd.ico
--- vcl/util/makefile.mk.pristine 2009-04-04 19:55:53.764002766 +0200
+++ vcl/util/makefile.mk 2009-04-04 19:55:42.260224623 +0200
More information about the ooo-build-commit
mailing list