--- solenv/inc/wntgcci6.mk.pristine	2008-10-29 08:42:22.000000000 +0100
+++ solenv/inc/wntgcci6.mk	2008-10-30 14:11:42.000000000 +0100
@@ -31,14 +31,19 @@
 
 # mk file for wntgcci6
 
-SOLAR_JAVA*=TRUE
+#SOLAR_JAVA*=TRUE
 FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g
 
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
 
+.IF "$(CROSS_COMPILING)" == "no"
 ASM=ml
 AFLAGS=/c /Cp /coff
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+ASM=$(NASM)
+REGCOMP:=wine $(SOLARBINDIR)/regcomp
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
@@ -50,7 +54,13 @@ CXX*=gcc
 #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)
 # new:
 #CYGINC=$(INCLUDE:s/-I /-I/:+"  ":s/;/ -I/:s/-I  //:s/   / /)
-CFLAGS=-fmessage-length=0 -c -nostdinc $(OLE2DEF)
+CFLAGS=-fmessage-length=0 -c $(OLE2DEF)
+.IF "$(CROSS_COMPILING)" == "no"
+CFLAGS += -nostdinc
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+CFLAGS += -D__CROSS__
+SCPDEFS += -D__MINGW32__ -D__CROSS__ -DDISABLE_ATL -DUSE_SYSTEM_STL
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
 ###
 CFLAGSCC=-pipe $(ARCH_FLAGS)
 CFLAGSCXX=-pipe $(ARCH_FLAGS)
@@ -109,18 +116,37 @@ DYNAMIC= -dynamic
 
 LINK*=$(CXX)
 LINKC*=$(CC)
-
-CYGLIB=$(LIB:s/;/ -L/)
-LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB)
+# FIXME: better way to strip trailing semicolon from $(LIB) to avoid
+# CYGLIB content to end with -L, eating next argument
+LIB___=$(LIB)---
+LIB_NO_TRAILING_SEMI___ = $(LIB___:s/;---//)
+LIB_NO_TRAILING_SEMI = $(LIB_NO_TRAILING_SEMI___:s/---//)
+CYGLIB=$(LIB_NO_TRAILING_SEMI:s/;/ -L/)
+LINKFLAGS=-Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc
+.IF "$(CYGLIB)" != ""
+LINKFLAGS += -L$(CYGLIB)
+.ENDIF #"$(CYGLIB)" != ""
+.IF "$(CROSS_COMPILING)" == "no"
+LINKFLAGS += -nostdlib
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+LINKFLAGS += -L$(SOLARBINDIR) -L$(SOLARLIBDIR) -L$(COMPATH)/../../bin -L$(COMPATH)/../../lib
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
 .IF "$(USE_MINGW)"=="cygwin"
 MINGWLIBDIR=$(COMPATH)$/lib$/mingw
 .ELSE
 MINGWLIBDIR=$(COMPATH)$/lib
 .ENDIF
-LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o
-LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o
+LINKFLAGSAPPGUI=-mwindows
+LINKFLAGSSHLGUI=--warn-once -mwindows -shared
+LINKFLAGSAPPCUI=-mconsole
+LINKFLAGSSHLCUI=--warn-once -mconsole -shared
+.IF "$(CROSS_COMPILING)" == "no"
+LINKFLAGSAPPGUI+=$(MINGWLIBDIR)$/crt2.o
+LINKFLAGSSHLGUI+=$(MINGWLIBDIR)$/dllcrt2.o
+LINKFLAGSAPPCUI+=$(MINGWLIBDIR)$/crt2.o
+LINKFLAGSSHLCUI+=$(MINGWLIBDIR)$/dllcrt2.o
+.ENDIF # "$(CROSS_COMPILING)" == "no"
+
 LINKFLAGSTACK=
 LINKFLAGSPROF=
 LINKFLAGSDEBUG=-g
@@ -144,24 +170,28 @@ STDLIBCUIMT+=-lmingwthrd
 STDSHLGUIMT+=-lmingwthrd
 STDSHLCUIMT+=-lmingwthrd
 .ENDIF
-STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
+STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion
+STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion
+STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion
+STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -lversion
 
 LIBSTLPORT=-lstlport_gcc
 LIBSTLPORTST=-lstlport_gcc_static
 
-LIBMGR=ar
+LIBMGR=$(AR)
 LIBFLAGS=-rsu
 
-IMPLIB=ld
+IMPLIB=$(LD)
 IMPLIBFLAGS=
 
 MAPSYM=tmapsym
 MAPSYMFLAGS=
 
+.IF "$(CROSS_COMPILING)" == "no"
 RC=rc
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+RC=wrc --nostdinc -I $(COMPATH)/../../include -I/ -DCROSS_COMPILING=1
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
 RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES)
 RCLINK=
 RCLINKFLAGS=
@@ -170,12 +200,22 @@ RCSETVERSION=
 DLLPOSTFIX=gi
 PCHPOST=.gch
 
+.IF "$(CROSS_COMPILING)" == "no"
+LINK_PSDK_LIB=$(PSDK_HOME)/lib/
+PSDK_DOT_LIB=.lib
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+DISABLE_ACTIVEX=TRUE
+DISABLE_ATL=TRUE
+LINK_PSDK_LIB=-l
+PSDK_DOT_LIB=
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 ADVAPI32LIB=-ladvapi32
 SHELL32LIB=-lshell32
 GDI32LIB=-lgdi32
 OLE32LIB=-lole32
 OLEAUT32LIB=-loleaut32
-UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib
+UUIDLIB=$(LINK_PSDK_LIB)uuid$(PSDK_DOT_LIB)
 WINSPOOLLIB=-lwinspool
 IMM32LIB=-limm32
 PSPLIB=-lpsp
@@ -189,14 +228,21 @@ USER32LIB=-luser32
 LIBCMT=-lmsvcrt
 COMDLG32LIB=-lcomdlg32
 COMCTL32LIB=-lcomctl32
-CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib
-GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib
-DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib
-MSILIB=$(PSDK_HOME)$/lib$/msi.lib
-DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
-SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
-URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
-UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
+CRYPT32LIB=$(LINK_PSDK_LIB)crypt32$(PSDK_DOT_LIB)
+GDIPLUSLIB=$(LINK_PSDK_LIB)gdiplus$(PSDK_DOT_LIB)
+DBGHELPLIB=$(LINK_PSDK_LIB)dbghelp$(PSDK_DOT_LIB)
+MSILIB=$(LINK_PSDK_LIB)msi$(PSDK_DOT_LIB)
+DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw$(PSDK_DOT_LIB)
+SHLWAPILIB=$(LINK_PSDK_LIB)shlwapi$(PSDK_DOT_LIB)
+URLMONLIB=$(LINK_PSDK_LIB)urlmon$(PSDK_DOT_LIB)
+UNICOWSLIB=$(LINK_PSDK_LIB)unicows$(PSDK_DOT_LIB)
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
-MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+MSIMG32LIB=$(LINK_PSDK_LIB)msimg32$(PSDK_DOT_LIB)
+
+.IF "$(CROSS_COMPILING)" == "yes"
+CURLLIB=-lcurl
+BERKELEYLIB=-ldb -lwsock32
+XSLTLIB=-lxslt -lxml2
+LIBXML2LIB=-lxml2
+.ENDIF
--- solenv/inc/shlinfo.rc.pristine	2008-10-29 09:33:25.000000000 +0100
+++ solenv/inc/shlinfo.rc	2008-10-29 09:33:33.000000000 +0100
@@ -29,7 +29,9 @@
  ************************************************************************/
 
 #define VERSION			3
+#ifndef CROSS_COMPILING
 #define SUBVERSION		0
+#endif
 #define VERVARIANT		0
 
 // .0 + VER_CONCEPT
@@ -140,7 +142,9 @@
 				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
+#ifndef CROSS_COMPILING
 				ADDITIONAL_VERINFO3
+#endif
 			}
 #endif
 		}
@@ -159,7 +161,11 @@ VS_VERSION_INFO versioninfo
 VS_VERSION_INFO rcdata
 {
 	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+#ifndef CROSS_COMPILING
 	VERSION, VERVARIANT, VER_COUNT
+#else
+	VERSION
+#endif
 };
 
 #endif // OS2