--- oo_1.1.1_src/autodoc/source/exes/adc_uni/makefile.mk.orig	2003-08-15 20:44:44.000000000 +0900
+++ oo_1.1.1_src/autodoc/source/exes/adc_uni/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -107,15 +107,21 @@
 APP1OBJS=   $(OBJ)$/main.obj
 
 .IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT) cosv.lib udm.lib
+.IF "$(COM)"!="GCC"
+APP1STDLIBS=
+.ELSE
+APP1STDLIBS= $(LIBSTLPORT)
+.ENDIF
 .ELSE
 .IF "$(OS)"=="MACOSX"
-APP1STDLIBS= $(LIBSTLPORT) -ludm -lcosv 
+APP1STDLIBS= $(LIBSTLPORT)
 .ELSE
-APP1STDLIBS= -lcosv -ludm
+APP1STDLIBS=
 .ENDIF
 .ENDIF
 
+APP1STDLIBS+= $(COSVLIB) $(UDMLIB)
+
 APP1LIBS=$(LB)$/atdoc.lib
 
 DEPOBJFILES += $(APP1OBJS)
--- oo_1.1.1_src/automation/util/makefile.mk.orig	2003-08-15 21:08:08.000000000 +0900
+++ oo_1.1.1_src/automation/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -103,9 +103,9 @@
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+=$(LIBCIMT) \
-		$(LIBPRE) app.lib \
-		$(LIBPRE) advapi32.lib	\
-		$(LIBPRE) gdi32.lib
+		$(APP3RDLIB) \
+		$(ADVAPI32LIB)	\
+		$(GDI32LIB)
 .ENDIF
 
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
@@ -126,8 +126,8 @@
 APP1STDLIBS= -lapp -lsample
 .ELSE
 APP1STDLIBS= \
-		app.lib \
-		sample.lib
+		$(APP3RDLIB) \
+		$(SAMPLE3RDLIB)
 .ENDIF
 	
 APP1STDLIBS+= \
@@ -223,8 +223,10 @@
 
 .IF "$(GUI)" != "UNX"
 #		win16 braucht ein appobj
+.IF "$(COM)"!="GCC"
 APP3OBJS=		$(OBJ)$/testapp.obj
 .ENDIF
+.ENDIF
 
 # --- Targets -----------------------------------------------------------
 
--- oo_1.1.1_src/basic/util/makefile.mk.orig	2003-03-19 01:28:40.000000000 +0900
+++ oo_1.1.1_src/basic/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -107,9 +107,11 @@
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=	\
 	$(SLO)$/sb.obj
 .ENDIF
+.ENDIF
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=	$(SLB)$/sb.lib
--- oo_1.1.1_src/basic/source/app/makefile.mk.orig	2001-02-06 20:15:44.000000000 +0900
+++ oo_1.1.1_src/basic/source/app/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -97,7 +97,8 @@
 	$(OBJ)$/comm_bas.obj
 
 EXCEPTIONSFILES = \
-	$(OBJ)$/app.obj
+	$(OBJ)$/app.obj	\
+	$(OBJ)$/process.obj
 
 
 SRCFILES = \
--- oo_1.1.1_src/berkeleydb/makefile.mk.orig	2004-01-09 22:44:32.000000000 +0900
+++ oo_1.1.1_src/berkeleydb/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -102,6 +102,22 @@
 .ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_DIR=out
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=/bin/sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LDFLAGS="-no-unde""fined $(SOLARLIB)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" ..$/dist$/configure --host=x86-pc-mingw32 --enable-cxx --enable-java --enable-dynamic --enable-shared'
+#CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=make
+
+OUT2BIN=java$/classes$/db.jar \
+	$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
+
+
+OUT2LIB= \
+	$(BUILD_DIR)$/.libs$/libdb*.a
+.ELSE
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
 
@@ -127,6 +143,7 @@
 	$(BUILD_DIR)$/Release$/libdb_java32.lib \
 	$(BUILD_DIR)$/Release$/libdb32.lib
 
+.ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
 
 OUT2INC= \
--- oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/makefile.mk.orig	2001-10-26 23:23:30.000000000 +0900
+++ oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -76,7 +76,7 @@
 
 # --- Files --------------------------------------------------------
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3"
+.IF "$(COM)" == "GCC"
 
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
@@ -104,6 +104,8 @@
 	$(CPPULIB)			\
 	$(SALLIB)
 
+DEF1NAME=	$(SHL1TARGET)
+
 .ENDIF
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk.orig	2001-09-25 18:15:38.000000000 +0900
+++ oo_1.1.1_src/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -109,9 +109,9 @@
 
 DEF1NAME=	$(SHL1TARGET)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-.ENDIF
-
--- oo_1.1.1_src/codemaker/source/javamaker/makefile.mk.orig	2001-08-17 22:15:48.000000000 +0900
+++ oo_1.1.1_src/codemaker/source/javamaker/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -76,8 +76,10 @@
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGSNOOPT+=-Ob0
 .ENDIF
+.ENDIF
 
 OBJFILES=   $(OBJ)$/javamaker.obj	\
             $(OBJ)$/javaoptions.obj	\
--- oo_1.1.1_src/codemaker/source/cppumaker/makefile.mk.orig	2001-08-17 22:15:48.000000000 +0900
+++ oo_1.1.1_src/codemaker/source/cppumaker/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -75,8 +75,10 @@
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGSNOOPT+=-Ob0
 .ENDIF
+.ENDIF
 
 OBJFILES=   $(OBJ)$/cppumaker.obj	\
             $(OBJ)$/cppuoptions.obj \
--- oo_1.1.1_src/connectivity/source/drivers/ado/makefile.mk.orig	2001-05-23 18:13:10.000000000 +0900
+++ oo_1.1.1_src/connectivity/source/drivers/ado/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -68,6 +68,7 @@
 
 #	ENABLE_EXCEPTIONS=TRUE
 
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -112,6 +113,8 @@
 		$(SLO)$/adoimp.obj
 		
 EXCEPTIONSFILES= \
+		$(SLO)$/ADatabaseMetaDataImpl.obj				\
+		$(SLO)$/Aolevariant.obj							\
 		$(SLO)$/ADatabaseMetaData.obj					\
 		$(SLO)$/AColumn.obj								\
 		$(SLO)$/AColumns.obj							\
@@ -137,7 +140,8 @@
 		$(SLO)$/APreparedStatement.obj					\
 		$(SLO)$/AResultSetMetaData.obj					\
 		$(SLO)$/ADriver.obj								\
-		$(SLO)$/Aservices.obj
+		$(SLO)$/Aservices.obj							\
+		$(SLO)$/adoimp.obj
 
 # --- Library -----------------------------------
 
@@ -149,9 +153,9 @@
 	$(VOSLIB)					\
 	$(OSLLIB)					\
 	$(SALLIB)					\
-	ole32.lib					\
-	oleaut32.lib				\
-	uuid.lib					\
+	$(OLE32LIB)					\
+	$(OLEAUT32LIB)				\
+	$(UUIDLIB)					\
 	$(DBTOOLSLIB)				\
 	$(COMPHELPERLIB)
 
--- oo_1.1.1_src/cppuhelper/source/makefile.mk.orig	2003-07-03 00:17:30.000000000 +0900
+++ oo_1.1.1_src/cppuhelper/source/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -70,6 +70,7 @@
 
 .IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES=UDK
+.ELSE
 .ENDIF # WNT
 
 # --- Settings -----------------------------------------------------
@@ -197,6 +198,8 @@
 SHL1VERSIONMAP=gcc2_linux_intel.map
 .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(GUI)$(COM)"=="WNTGCC"
+SHL1VERSIONMAP=mingw.map
 .ENDIF
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/crashrep/source/win32/makefile.mk.orig	2004-01-10 01:26:24.000000000 +0900
+++ oo_1.1.1_src/crashrep/source/win32/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -79,12 +79,14 @@
 
 STDLIB1=\
 	$(SALLIB)\
-	gdi32.lib\
-	comctl32.lib\
-	comdlg32.lib\
-	advapi32.lib\
-	wsock32.lib\
-	dbghelp.lib
+	$(GDI32LIB)\
+	$(COMCTL32LIB)\
+	$(COMDLG32LIB)\
+	$(ADVAPI32LIB)\
+	$(WSOCK32LIB)\
+	$(DBGHELPLIB)\
+	$(SHELL32LIB)\
+	$(PSAPILIB)
 
 APP1NOSVRES=$(RES)$/$(TARGET).res
 
@@ -96,5 +98,5 @@
 # using lngconvex.exe 
 
 $(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
-    +lngconvex.exe -lng ..\all\crashrep.lng -rc $(TARGET).rc -c  ctrylnglist.txt  -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
+    +$(WRAPCMD) lngconvex.exe -lng ../all/crashrep.lng -rc $(TARGET).rc -c  ctrylnglist.txt  -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
     
--- oo_1.1.1_src/curl/makefile.mk.orig	2003-07-17 02:24:06.000000000 +0900
+++ oo_1.1.1_src/curl/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -92,6 +92,19 @@
 
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+PATCH_FILE_NAME=unx1-curl-7.9.8.patch
+CONFIGURE_DIR=.$/
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=/bin/sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LIBS="-lws2_32 -lwinmm -lmingwthrd" .$/configure --host=x86-pc-mingw32 --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict'
+#CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict 
+
+BUILD_DIR=$(CONFIGURE_DIR)$/lib
+BUILD_ACTION=make
+
+OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
+.ELSE
 PATCH_FILE_NAME=curl-7.9.8.patch
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
@@ -102,6 +115,7 @@
 OUT2BIN=$(BUILD_DIR)$/libcurl.dll
 OUT2LIB=$(BUILD_DIR)$/libcurl.lib
 
+.ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
 
 
--- oo_1.1.1_src/desktop/util/makefile.mk.orig	2004-01-28 22:06:48.000000000 +0900
+++ oo_1.1.1_src/desktop/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -182,7 +182,7 @@
 APP2DEPN= $(APP2RES) verinfo.rc
 APP2NOSAL=TRUE
 APP2TARGET=sowrapper
-APP2STDLIBS+=shell32.lib
+APP2STDLIBS+=$(SHELL32LIB)
 APP2OBJS=       $(OBJ)$/sowrapper.obj \
                 $(OBJ)$/wrapperw.obj \
                 $(OBJ)$/wrappera.obj
@@ -195,7 +195,7 @@
 APP3DEPN= $(APP3RES) verinfo.rc
 APP3NOSAL=TRUE
 APP3TARGET=solocal
-APP3STDLIBS+=shell32.lib
+APP3STDLIBS+=$(SHELL32LIB)
 APP3OBJS= \
                 $(OBJ)$/sowrapper.obj \
                 $(OBJ)$/lwrapw.obj \
@@ -208,7 +208,7 @@
 APP4DEPN= $(APP4RES) verinfo.rc
 APP4NOSAL=TRUE
 APP4TARGET=soremote
-APP4STDLIBS+=shell32.lib
+APP4STDLIBS+=$(SHELL32LIB)
 APP4OBJS= \
                 $(OBJ)$/sowrapper.obj \
                 $(OBJ)$/rwrapw.obj \
--- oo_1.1.1_src/dtrans/util/makefile.mk.orig	2003-04-15 23:06:12.000000000 +0900
+++ oo_1.1.1_src/dtrans/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,7 +87,7 @@
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= \
-		uwinapi.lib
+		$(UWINAPILIB)
 .ENDIF
 
 
@@ -115,10 +115,10 @@
 		$(SALLIB)	\
 		$(CPPULIB) 	\
 		$(CPPUHELPERLIB)\
-		uwinapi.lib\
-		advapi32.lib\
-		ole32.lib\
-		gdi32.lib
+		$(UWINAPILIB)\
+		$(ADVAPILIB)\
+		$(OLE32LIB)\
+		$(GDI32LIB)
 
 SHL2IMPLIB=i$(SHL2TARGET) 
 
@@ -136,17 +136,26 @@
 		 $(SLB)$/dtobjfact.lib\
 		 $(SLB)$/mtaolecb.lib
 
+SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj
+
+.IF "$(COM)"=="GCC"
+SHL3STDLIBS= \
+		-luuid
+.ELSE
 SHL3STDLIBS= \
+		comsupp.lib
+.ENDIF
+
+SHL3STDLIBS+= \
 		$(SALLIB)	\
 		$(CPPULIB) 	\
 		$(CPPUHELPERLIB)\
-		uwinapi.lib\
-		advapi32.lib\
-		ole32.lib\
-		comsupp.lib\
-		oleaut32.lib\
-		gdi32.lib
-		
+		$(UWINAPILIB)\
+		$(ADVAPI32LIB)\
+		$(OLE32LIB)\
+		$(OLEAUT32LIB)\
+		$(GDI32LIB)
+
 SHL3IMPLIB=i$(SHL3TARGET) 
 
 SHL3DEF=		$(MISC)$/$(SHL3TARGET).def
@@ -163,16 +172,23 @@
 			$(SLB)$/dtobjfact.lib\
 			$(SLB)$/dtutils.lib
 
+.IF "$(COM)"=="GCC"
+SHL4STDLIBS= \
+		-luuid
+.ELSE
 SHL4STDLIBS= \
+		comsupp.lib
+.ENDIF
+
+SHL4STDLIBS+= \
 		$(SALLIB)	\
 		$(CPPULIB) 	\
 		$(CPPUHELPERLIB) \
-		uwinapi.lib\
-		advapi32.lib\
-		ole32.lib\
-		comsupp.lib\
-		oleaut32.lib\
-		gdi32.lib
+		$(UWINAPILIB)\
+		$(ADVAPI32LIB)\
+		$(OLE32LIB)\
+		$(OLEAUT32LIB)\
+		$(GDI32LIB)
 
 SHL4DEPN=
 SHL4IMPLIB=i$(SHL4TARGET) 
--- oo_1.1.1_src/dtrans/source/win32/mtaole/makefile.mk.orig	2001-03-14 23:46:34.000000000 +0900
+++ oo_1.1.1_src/dtrans/source/win32/mtaole/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -64,6 +64,7 @@
 PRJNAME=dtrans
 TARGET=mtaolecb
 LIBTARGET=NO
+ENABLE_EXCEPTIONS=YES
 
 # --- Settings ----------------------------------
 
--- oo_1.1.1_src/dtrans/source/win32/misc/makefile.mk.orig	2001-02-27 16:25:58.000000000 +0900
+++ oo_1.1.1_src/dtrans/source/win32/misc/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -66,6 +66,7 @@
 TARGET=dtutils
 LIBTARGET=NO
 USE_BOUNDCHK=
+ENABLE_EXCEPTIONS=YES
 
 .IF "$(USE_BOUNDCHK)"=="TR"
 bndchk=tr
--- oo_1.1.1_src/dtrans/source/win32/dtobj/makefile.mk.orig	2003-03-25 23:05:38.000000000 +0900
+++ oo_1.1.1_src/dtrans/source/win32/dtobj/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -93,7 +93,18 @@
 		 $(SLO)$/XNotifyingDataObject.obj
 
 LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
+LIB1OBJFILES=$(SLO)$/DtObjFactory.obj\
+		 $(SLO)$/APNDataObject.obj\
+		 $(SLO)$/DOTransferable.obj\
+		 $(SLO)$/DTransHelper.obj\
+		 $(SLO)$/XTDataObject.obj\
+		 $(SLO)$/TxtCnvtHlp.obj\
+		 $(SLO)$/DataFmtTransl.obj\
+		 $(SLO)$/FmtFilter.obj\
+		 $(SLO)$/FetcList.obj\
+		 $(SLO)$/Fetc.obj
+
+
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/dtrans/source/win32/clipb/makefile.mk.orig	2003-03-25 23:05:34.000000000 +0900
+++ oo_1.1.1_src/dtrans/source/win32/clipb/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -82,7 +82,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF "$(COM)" == "GCC"
+CFLAGS+=-DUNICODE -D_UNICODE
+.ELSE
 CFLAGS+=-GR -DUNICODE -D_UNICODE
+.ENDIF
 
 SLOFILES=$(SLO)$/WinClipboard.obj \
 		 $(SLO)$/WinClipbImpl.obj \
--- oo_1.1.1_src/dtrans/source/cnttype/wbench/makefile.mk.orig	2001-02-01 00:36:58.000000000 +0900
+++ oo_1.1.1_src/dtrans/source/cnttype/wbench/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -74,7 +74,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=-GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/embedserv/util/makefile.mk.orig	2003-05-22 18:22:02.000000000 +0900
+++ oo_1.1.1_src/embedserv/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -93,8 +93,8 @@
     $(SALLIB) 	\
 	$(CPPULIB)	\
 	$(CPPUHELPERLIB)	\
-	ole32.lib 	\
-	gdi32.lib 	\
-	uuid.lib 	\
-	oleaut32.lib
+	$(OLE32LIB) 	\
+	$(GDI32LIB) 	\
+	$(UUIDLIB) 	\
+	$(OLEAUT32LIB)
 
--- oo_1.1.1_src/extensions/source/plugin/util/makefile.mk.orig	2003-08-15 21:05:18.000000000 +0900
+++ oo_1.1.1_src/extensions/source/plugin/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -86,9 +86,9 @@
 .IF "$(GUI)" == "WNT"
 SHL1LINKLIB = $(SLB)$/plwin.lib
 SHL1OWNLIBS = \
-	version.lib	\
-	ole32.lib	\
-	advapi32.lib
+	$(VERSIONLIB)	\
+	$(OLE32LIB)	\
+	$(ADVAPI32LIB)
 .ENDIF # WNT
 
 .IF "$(GUI)" == "OS2"
--- oo_1.1.1_src/extensions/source/ole/makefile.mk.orig	2004-01-20 19:08:50.000000000 +0900
+++ oo_1.1.1_src/extensions/source/ole/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -145,7 +145,7 @@
 
 
 .IF "$(GUI)"=="WNT"
-
+.IF "$(COM)"!="GCC"
 
 
 
@@ -162,6 +162,18 @@
 
 
 SHL1TARGET=$(TARGET)
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=\
+        $(SALLIB) 	\
+	$(VOSLIB)	\
+	$(CPPULIB)	\
+	$(CPPUHELPERLIB)	\
+	$(LIBCIMT) 	\
+	-lole32 	\
+	-luuid 	\
+	-ladvapi32	\
+	-loleaut32
+.ELSE
 SHL1STDLIBS=\
         $(SALLIB) 	\
 	$(VOSLIB)	\
@@ -172,4 +184,5 @@
 	uuid.lib 	\
 	advapi32.lib	\
 	oleaut32.lib
+.ENDIF
 
@@ -187,6 +200,7 @@
 DEF1EXPORTFILE=$(SHL1TARGET).dxp
 
 .ENDIF
+.ENDIF
 
 #----------------------------------------------------------------
 
--- oo_1.1.1_src/extensions/source/installation/office/protchk/makefile.mk.orig	2002-10-01 17:24:48.000000000 +0900
+++ oo_1.1.1_src/extensions/source/installation/office/protchk/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -145,7 +145,7 @@
 	$(SALLIB)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= advapi32.lib shell32.lib
+SHL1STDLIBS+= $(ADVAPI32LIB) $(SHELL32LIB)
 SHL1OBJS= $(SLO)$/regtools.obj
 .ENDIF
 
--- oo_1.1.1_src/extensions/source/activex/msidl/makefile.mk.orig	2003-03-26 01:01:04.000000000 +0900
+++ oo_1.1.1_src/extensions/source/activex/msidl/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -26,6 +26,7 @@
 .INCLUDE : settings.mk
 
 .IF "$(GUI)" == "WNT"
+.IF "$(COM)"!="GCC"
 
 # --- Targets ----------------------------------
 
@@ -38,10 +39,19 @@
 
 MTL_SWITCHES=/tlb $(MISC)\so_activex.tlb /h $(MISC)\so_activex.h /iid $(MISC)\so_activex_i.c /dlldata $(MISC)\so_activex_dll.c /proxy $(MISC)\so_activex_p.c /Oicf
 
+.IF "$(COM)"=="GCC"
+MTL_SWITCHES+=/no_cpp
+
+activex_component : $(SOURCE) 
+	guw.pl idlcpp -D__MINGW32__ -I$(CYGINC) $(SOURCE) > $(MISC)$/so_activex.idl
+	$(MTL) $(MTL_SWITCHES) $(MISC)\so_activex.idl
+.ELSE
 activex_component : $(SOURCE) 
 	$(MTL) $(MTL_SWITCHES) $(SOURCE) 
+.ENDIF
 
 .ENDIF
+.ENDIF
 
 .INCLUDE : target.mk
 
--- oo_1.1.1_src/extensions/source/activex/main/makefile.mk.orig	2003-06-12 19:44:38.000000000 +0900
+++ oo_1.1.1_src/extensions/source/activex/main/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -71,6 +71,7 @@
 .INCLUDE : settings.mk
 
 .IF "$(GUI)" == "WNT"
+.IF "$(COM)" != "GCC"
 
 VERSIONOBJ=
 LIBTARGET=NO
@@ -126,6 +127,7 @@
 SHL1RES=$(RES)$/$(TARGET).res
 
 .ENDIF
+.ENDIF
 
 # --- Targets ----------------------------------
 
--- oo_1.1.1_src/external/unicows/makefile.mk.orig	2004-03-13 22:01:54.000000000 +0900
+++ oo_1.1.1_src/external/unicows/makefile.mk	2004-02-22 23:10:38.000000000 +0900
@@ -0,0 +1,17 @@
+PRJ=..
+PRJNAME=3rdparty
+TARGET=unicows
+
+.INCLUDE : settings.mk
+
+.IF "$(GUI)$(COM)"=="WNTGCC"
+ALL: $(LB)$/libunicows.a
+
+$(LB)$/libunicows.a:
+	echo EXPORTS > $(MISC)$/unicows.def
+	guw.pl reimp -s $(PSDK_HOME)$/lib$/unicows.lib | sed -e 's:^_::' >> $(MISC)$/unicows.def
+	dlltool --dllname unicows.dll --input-def=$(MISC)$/unicows.def --kill-at --output-lib=$(LB)$/libunicows.a
+
+.ENDIF
+
+.INCLUDE :  target.mk
--- oo_1.1.1_src/external/dbghelp/makefile.mk.orig	2004-03-13 22:01:54.000000000 +0900
+++ oo_1.1.1_src/external/dbghelp/makefile.mk	2004-02-22 23:07:18.000000000 +0900
@@ -0,0 +1,16 @@
+PRJ=..
+PRJNAME=3rdparty
+TARGET=dbghelp
+
+.INCLUDE : settings.mk
+
+.IF "$(GUI)$(COM)"=="WNTGCC"
+ALL: $(LB)$/libdbghelp.a
+
+$(LB)$/libdbghelp.a:
+	echo EXPORTS > $(MISC)$/dbghelp.def
+	guw.pl reimp -s $(PSDK_HOME)$/lib$/dbghelp.lib | sed -e 's:^_::' >> $(MISC)$/dbghelp.def
+	dlltool --dllname dbghelp.dll --input-def=$(MISC)$/dbghelp.def --kill-at --output-lib=$(LB)$/libdbghelp.a
+.ENDIF
+
+.INCLUDE :  target.mk
--- oo_1.1.1_src/fpicker/util/makefile.mk.orig	2002-08-26 23:03:30.000000000 +0900
+++ oo_1.1.1_src/fpicker/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -84,16 +84,17 @@
 			$(SALLIB)\
 			$(VCLLIB)\
 			$(TOOLSLIB)\
-			uwinapi.lib \
-			advapi32.lib \
-			shell32.lib\
-			ole32.lib\
-			gdi32.lib\
-			oleaut32.lib\
-			comdlg32.lib\
-			kernel32.lib\
-			comsupp.lib\
-			oleaut32.lib
+			$(UWINAPILIB) \
+			$(ADVAPI32LIB) \
+			$(SHELL32LIB)\
+			$(OLE32LIB)\
+			$(GDI32LIB)\
+			$(OLEAUT32LIB)\
+			$(COMDLG32LIB)
+
+.IF "$(COM)"!="GCC"
+SHL2STDLIBS+=comsupp.lib
+.ENDIF
 
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
@@ -118,13 +119,16 @@
 			$(SALLIB)\
 			$(TOOLSLIB)\
 			$(VCLLIB)\
-			uwinapi.lib \
-			advapi32.lib \
-			ole32.lib\
-			gdi32.lib\
-			shell32.lib\
-			comsupp.lib\
-			oleaut32.lib
+			$(UWINAPILIB) \
+			$(ADVAPI32LIB) \
+			$(OLE32LIB)\
+			$(GDI32LIB)\
+			$(SHELL32LIB)\
+			$(OLEAUT32LIB)
+
+.IF "$(COM)"!="GCC"
+SHL2STDLIBS+=comsupp.lib
+.ENDIF
 
 SHL2DEPN=
 SHL2IMPLIB=i$(SHL2TARGET)
--- oo_1.1.1_src/fpicker/source/win32/misc/makefile.mk.orig	2003-03-26 03:05:08.000000000 +0900
+++ oo_1.1.1_src/fpicker/source/win32/misc/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -71,7 +71,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
+.ELSE
 CFLAGS+=-GX -DUNICODE -D_UNICODE
+.ENDIF
 
 # --- Files -------------------------------------
 
--- oo_1.1.1_src/fpicker/source/win32/folderpicker/workbench/makefile.mk.orig	2003-03-26 03:05:06.000000000 +0900
+++ oo_1.1.1_src/fpicker/source/win32/folderpicker/workbench/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -75,7 +75,11 @@
 
 .INCLUDE : ..$/..$/..$/cppumaker.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=-GR -GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/fpicker/source/win32/filepicker/workbench/makefile.mk.orig	2003-03-26 03:05:06.000000000 +0900
+++ oo_1.1.1_src/fpicker/source/win32/filepicker/workbench/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -73,7 +73,11 @@
 
 .INCLUDE : ..$/..$/..$/cppumaker.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=-GR -GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/fpicker/source/win32/filepicker/makefile.mk.orig	2003-03-26 03:05:00.000000000 +0900
+++ oo_1.1.1_src/fpicker/source/win32/filepicker/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -77,7 +77,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs -D_WIN32_WINNT=0x0500 -D_UNICODE -DUNICODE
+.ELSE
 CFLAGS+=-GX -GR -D_WIN32_WINNT=0x0500 -D_UNICODE -DUNICODE
+.ENDIF
 
 # --- Resources ----------------------------------------------------
 
--- oo_1.1.1_src/framework/util/makefile.mk.orig	2004-01-16 00:18:14.000000000 +0900
+++ oo_1.1.1_src/framework/util/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -142,10 +142,9 @@
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+=\
-		uwinapi.lib \
-		unicows.lib \
-		advapi32.lib \
-		kernel32.lib
+		$(UWIN32LIB) \
+		$(UNICOWSLIB) \
+		$(ADVAPI32LIB)
 .ENDIF
 
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/itiff/makefile.mk.orig	2003-04-15 23:14:38.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/itiff/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -89,8 +89,10 @@
 SHL1LIBS=       $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/itiff.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/itga/makefile.mk.orig	2003-04-15 23:14:18.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/itga/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/itga.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/itga.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/iras/makefile.mk.orig	2003-04-15 23:13:56.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/iras/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/iras.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/iras.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ipsd/makefile.mk.orig	2003-04-15 23:13:36.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ipsd/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/ipsd.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/ipsd.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ipict/makefile.mk.orig	2003-04-15 23:13:16.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ipict/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=       $(SLB)$/ipict.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/ipict.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ipcx/makefile.mk.orig	2003-04-15 23:12:54.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ipcx/makefile.mk	2004-03-29 12:17:32.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=       $(SLB)$/ipcx.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/ipcx.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ipcd/makefile.mk.orig	2003-04-15 23:12:32.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ipcd/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=       $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/ipcd.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ipbm/makefile.mk.orig	2003-04-15 23:12:14.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ipbm/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/ipbm.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/ipbm.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ios2met/makefile.mk.orig	2003-04-15 23:11:52.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ios2met/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -88,8 +88,10 @@
 SHL1LIBS=       $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/ios2met.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/ieps/makefile.mk.orig	2003-04-15 23:11:32.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/ieps/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=       $(SLB)$/ieps.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/ieps.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/idxf/makefile.mk.orig	2003-04-15 23:11:12.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/idxf/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -95,8 +95,10 @@
 SHL1LIBS=       $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/idxf.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/expm/makefile.mk.orig	2003-04-15 23:10:26.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/expm/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -88,8 +88,10 @@
 SHL1LIBS=		$(SLB)$/expm.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/expm.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/etiff/makefile.mk.orig	2003-04-15 23:10:06.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/etiff/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/etiff.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/etiff.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/eras/makefile.mk.orig	2003-04-15 23:09:44.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/eras/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,10 @@
 SHL1LIBS=		$(SLB)$/eras.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/eras.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/eps/makefile.mk.orig	2003-07-09 19:15:44.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/eps/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -97,8 +97,10 @@
 SHL1LIBS=		$(SLB)$/eps.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/eps.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/eppm/makefile.mk.orig	2003-04-15 23:08:56.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/eppm/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -96,8 +96,10 @@
 SHL1LIBS=		$(SLB)$/eppm.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/eppm.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/epng/makefile.mk.orig	2003-04-15 23:08:38.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/epng/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -95,8 +95,10 @@
 SHL1LIBS=		$(SLB)$/epng.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/epng.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/epict/makefile.mk.orig	2003-04-15 23:08:16.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/epict/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -97,8 +97,10 @@
 SHL1LIBS=       $(SLB)$/epict.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/epict.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/epgm/makefile.mk.orig	2003-04-15 23:07:54.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/epgm/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -97,8 +97,10 @@
 SHL1LIBS=		$(SLB)$/epgm.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/epgm.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/epbm/makefile.mk.orig	2003-04-15 23:07:34.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/epbm/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -96,8 +96,10 @@
 SHL1LIBS=		$(SLB)$/epbm.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=		$(SLO)$/epbm.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/eos2met/makefile.mk.orig	2003-04-15 23:07:14.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/eos2met/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -95,8 +95,10 @@
 SHL1DEPN=       $(LB)$/eos2met.lib
 SHL1LIBS=       $(SLB)$/eos2met.lib
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/eos2met.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/goodies/source/filter.vcl/egif/makefile.mk.orig	2003-04-15 23:06:50.000000000 +0900
+++ oo_1.1.1_src/goodies/source/filter.vcl/egif/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -98,8 +98,10 @@
 SHL1LIBS=       $(SLB)$/egif.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 SHL1OBJS=       $(SLO)$/egif.obj
 .ENDIF
+.ENDIF
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/i18npool/source/search/makefile.mk.orig	2003-04-24 20:07:56.000000000 +0900
+++ oo_1.1.1_src/i18npool/source/search/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -83,7 +83,7 @@
 SHL1TARGET= i18nsearch
 SHL1OBJS=	$(SLOFILES)
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(COM)"=="GCC"
 I18NREGEXPLIB=-li18nregexp$(COMID)
 .ELSE
 I18NREGEXPLIB=ii18nregexp.lib
--- oo_1.1.1_src/i18npool/source/localedata/data/makefile.mk.orig	2004-01-10 02:39:42.000000000 +0900
+++ oo_1.1.1_src/i18npool/source/localedata/data/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -76,8 +76,13 @@
 
 # macro to link with localedata_en library
 .IF "$(GUI)" == "WNT"
+.IF "$(COM)"=="GCC"
+LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
+LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
+.ELSE
 LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
 LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
+.ENDIF
 .ELSE
 LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
 LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
--- oo_1.1.1_src/icu/makefile.mk.orig	2003-07-17 02:26:10.000000000 +0900
+++ oo_1.1.1_src/icu/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -127,6 +127,27 @@
 
 .IF "$(GUI)"=="WNT"
 CONFIGURE_DIR=source
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS="-O -mthreads" CXXFLAGS="-O -mthreads" LIBS="-mthreads" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_FLAGS=
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+OUT2LIB= \
+	$(BUILD_DIR)$/data$/out$/libicudata.a \
+	$(BUILD_DIR)$/common$/libicuuc.a \
+	$(BUILD_DIR)$/i18n$/libicui18n.a \
+	$(BUILD_DIR)$/layout$/libicule.a
+
+OUT2BIN= \
+	$(BUILD_DIR)$/data$/out$/icudata.22$(DLLPOST) \
+	$(BUILD_DIR)$/data$/out$/icudata$(DLLPOST) \
+	$(BUILD_DIR)$/common$/icuuc.22$(DLLPOST) \
+	$(BUILD_DIR)$/common$/icuuc$(DLLPOST) \
+	$(BUILD_DIR)$/i18n$/icui18n.22$(DLLPOST) \
+	$(BUILD_DIR)$/i18n$/icui18n$(DLLPOST) \
+	$(BUILD_DIR)$/layout$/icule.22$(DLLPOST) \
+	$(BUILD_DIR)$/layout$/icule$(DLLPOST)
+.ELSE
 .IF "$(USE_SHELL)"=="4nt"
 BUILD_ACTION_SEP=^
 CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat
@@ -154,6 +175,7 @@
 	$(BUILD_DIR)$/..$/bin$/icuuc22.dll \
 	$(BUILD_DIR)$/..$/bin$/icule22.dll
 .ENDIF
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/idl/util/makefile.mk.orig	2003-03-26 21:08:20.000000000 +0900
+++ oo_1.1.1_src/idl/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,8 +87,12 @@
 APP1TARGET= svidl
 
 .IF "$(GUI)" != "MAC"
+.IF "$(GUI)$(COM)" == "WNTGCC"
+APP1DEPN=       $(L)$/libtl$(VERSION)$(DLLPOSTFIX).a
+.ELSE
 APP1DEPN=       $(L)$/itools.lib
 .ENDIF
+.ENDIF
 
 APP1STDLIBS=	\
 	$(TOOLSLIB)	\
@@ -96,6 +100,7 @@
 
 APP1LIBS=	$(LIBPRE) $(LB)$/$(TARGET).lib
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)"!="GCC"
 .IF "$(COM)"=="WTC"
 APP1OBJS=	$(OBJ)$/svidl.obj
 .ELSE
@@ -103,6 +108,7 @@
 			$(OBJ)$/command.obj
 .ENDIF
 .ENDIF
+.ENDIF
 .IF "$(COM)" == "WTC"
 APP1STACK=32768
 .ENDIF
--- oo_1.1.1_src/idlc/source/preproc/makefile.mk.orig	2003-03-26 21:11:12.000000000 +0900
+++ oo_1.1.1_src/idlc/source/preproc/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -102,8 +102,10 @@
 
 APP1TARGET= $(TARGET)
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)" != "GCC"
 APP1OBJS=$(OBJ)$/cpp.obj
 .ENDIF
+.ENDIF
 
 APP1LIBS= $(LB)$/idlcpp.lib
 APP1DEPN=  
--- oo_1.1.1_src/jvmaccess/util/makefile.mk.orig	2004-01-10 02:52:20.000000000 +0900
+++ oo_1.1.1_src/jvmaccess/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,7 +87,7 @@
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
 .IF "$(OS)" == "WNT"
-SHL1STDLIBS += advapi32.lib
+SHL1STDLIBS += $(ADVAPI32LIB)
 .ENDIF # WNT
 
 .IF "$(COMNAME)" == "msci"
@@ -98,6 +98,8 @@
 SHL1VERSIONMAP = gcc3_linux_intel.map
 .ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"
 SHL1VERSIONMAP = gcc3_linux_intel.map
+.ELIF "$(GUI)$(COM)" == "WNTGCC"
+SHL1VERSIONMAP = gcc3_linux_intel.map
 .ENDIF
 
 DEF1NAME = $(SHL1TARGET)
--- oo_1.1.1_src/lingucomponent/source/thesaurus/libth/makefile.mk.orig	2003-03-26 22:03:08.000000000 +0900
+++ oo_1.1.1_src/lingucomponent/source/thesaurus/libth/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -67,18 +67,6 @@
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-
-.IF "$(ULINGULIB)"==""
-.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-ULINGULIB=$(LIBPRE) ulingu.lib
-.ENDIF # wnt
-.ENDIF
-
-
-
 #----- Settings ---------------------------------------------------------
 
 .INCLUDE : settings.mk
--- oo_1.1.1_src/lingucomponent/source/spellcheck/spell/makefile.mk.orig	2003-03-26 22:03:02.000000000 +0900
+++ oo_1.1.1_src/lingucomponent/source/spellcheck/spell/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -67,27 +67,6 @@
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(MYSPELLLIB)"==""
-.IF "$(GUI)"=="UNX"
-MYSPELLLIB=-lmyspell
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-MYSPELLLIB=libmyspell.lib
-.ENDIF # wnt
-.ENDIF
-
-.IF "$(ULINGULIB)"==""
-.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-ULINGULIB=$(LIBPRE) ulingu.lib
-.ENDIF # wnt
-.ENDIF
-
-
-
-
 #----- Settings ---------------------------------------------------------
 
 .INCLUDE : settings.mk
--- oo_1.1.1_src/lingucomponent/source/lingutil/makefile.mk.orig	2003-06-12 19:36:46.000000000 +0900
+++ oo_1.1.1_src/lingucomponent/source/lingutil/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -87,7 +87,9 @@
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
-
+.IF "$(GUI)$(COM)"=="WNTGCC"
+DEFLIB1NAME=	$(SLB)$/$(TARGET)
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk.orig	2003-03-26 22:02:08.000000000 +0900
+++ oo_1.1.1_src/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -67,23 +67,6 @@
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="UNX"
-HNJLIB=-lhnj
-.ELSE
-HNJLIB=libhnj.lib
-.ENDIF
-
-.IF "$(ULINGULIB)"==""
-.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-ULINGULIB=$(LIBPRE) ulingu.lib
-.ENDIF # wnt
-.ENDIF
-
-
-
 #----- Settings ---------------------------------------------------------
 
 .INCLUDE : settings.mk
--- oo_1.1.1_src/moz/zipped/makefile.mk.orig	2004-01-10 02:57:26.000000000 +0900
+++ oo_1.1.1_src/moz/zipped/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -78,6 +78,14 @@
 
 .ELSE	"$(OS)" == "MACOSX"
 
+.IF "$(GUI)$(COM)"=="WNTGCC"
+
+
+dummy:
+	@echo "Nothing to build for Mingw"
+
+.ELSE	"$(GUI)$(COM)"=="WNTGCC"
+
 all: \
 	$(MISC)$/unpacked_$(TARGET)_inc \
 	$(MISC)$/unpacked_$(TARGET)_lib \
@@ -107,6 +115,8 @@
 $(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip
 	+$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
 
+.ENDIF	"$(GUI)$(COM)"=="WNTGCC"
+
 .ENDIF	# "$(OS)" == "MACOSX"
 
 .INCLUDE :  target.mk
--- oo_1.1.1_src/odk/util/odk_rules.pmk.orig	2004-01-10 03:02:12.000000000 +0900
+++ oo_1.1.1_src/odk/util/odk_rules.pmk	2004-03-29 12:17:34.000000000 +0900
@@ -316,6 +316,10 @@
 	+-rm -f $@ >& $(NULLDEV)
 	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
 
+$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
+	+-rm -f $@ >& $(NULLDEV)
+	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
+
 $(DIR_CREATE_FLAG) :
 .IF "$(USE_SHELL)" != "4nt"
     +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
--- oo_1.1.1_src/odk/source/bean/native/win32/makefile.mk.orig	2003-03-26 22:40:52.000000000 +0900
+++ oo_1.1.1_src/odk/source/bean/native/win32/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -20,7 +20,11 @@
 SHL1TARGET=$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 #SHL1IMPLIB=	i$(TARGET)
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=-ljawt $(SALLIB)
+.ELSE
 SHL1STDLIBS=jawt.lib $(SALLIB)
+.ENDIF
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
--- oo_1.1.1_src/odk/pack/copying/makefile.mk.orig	2004-01-10 03:02:06.000000000 +0900
+++ oo_1.1.1_src/odk/pack/copying/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -126,6 +126,17 @@
 	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIBLIST = \
+	$(DESTDIRLIB)$/libstore.a 	\
+	$(DESTDIRLIB)$/libreg.a 	\
+	$(DESTDIRLIB)$/libsal.a 	\
+	$(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a 	\
+	$(DESTDIRLIB)$/libcppu.a 	\
+	$(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a 	\
+	$(DESTDIRLIB)$/librmcxt.a	\
+	$(DESTDIRLIB)$/libstlport_gcc.a
+.ELSE
 LIBLIST = \
 	$(DESTDIRLIB)$/istore.lib 	\
 	$(DESTDIRLIB)$/ireg.lib 	\
@@ -141,6 +152,7 @@
 	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
 .ENDIF
 .ENDIF
+.ENDIF
 
 SETTINGSLIST= \
 	$(DESTDIRSETTINGS)$/settings.mk \
--- oo_1.1.1_src/offmgr/util/makefile.mk.orig	2003-08-15 20:44:06.000000000 +0900
+++ oo_1.1.1_src/offmgr/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -155,7 +155,7 @@
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
-SHL2STDLIBS += $(LIBPRE) advapi32.lib
+SHL2STDLIBS += $(ADVAPI32LIB)
 .ENDIF # WNT
 
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
--- oo_1.1.1_src/psprint/util/makefile.mk.orig	2004-01-28 20:26:14.000000000 +0900
+++ oo_1.1.1_src/psprint/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -79,8 +79,30 @@
 .ELSE		# "$(GUIBASE)"=="aqua"
 
 .IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1FILES=	$(SLB)$/fontsubset.lib
+
+SHL1TARGET= psp$(UPD)$(DLLPOSTFIX)
+SHL1IMPLIB= ipsp
+SHL1LIBS=$(LIB1FILES)
+
+SHL1STDLIBS=$(SALLIB)
+
+SHL1VERSIONMAP=libpsp_mingw.map
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+
+# --- Def-File ---
+
+DEF1NAME=	$(SHL1TARGET)
+DEF1DES=PSPrint
+
+.ELSE
 LIB1TARGET= $(SLB)$/a$(TARGET).lib
 LIB1FILES=	$(SLB)$/fontsubset.lib
+.ENDIF
 .ELSE
 
 LIB1TARGET= $(SLB)$/$(TARGET).lib
--- oo_1.1.1_src/python/makefile.mk.orig	2004-01-28 21:02:42.000000000 +0900
+++ oo_1.1.1_src/python/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -77,6 +77,9 @@
 
 BUILD_DIR=
 
+PWDCMD=pwd
+ADDITIONAL_FILES=Lib/plat-cygwin Python/fileblocks.c
+
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
 .IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
@@ -117,6 +120,14 @@
 PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
 .ENDIF
 .ELSE
+.IF "$(COM)"=="GCC"
+PWDCMD=cygpath -m `pwd`
+CONFIGURE_ACTION= sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" DEFS="-mthreads" LIBS="-L$(CYGLIB) -mthreads" ./configure --prefix=../python-inst --with-threads'
+BUILD_ACTION=$(ENV_BUILD) setenv PWDCMD "$(PWDCMD)" ; make ; make install
+PYTHONCORESHL=$(OUT)$/bin$/$(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST)
+PYTHONCORELINK1=$(OUT)$/bin$/$(DLLPRE)python$(PYMAJOR)$(DLLPOST)
+PYTHONCORELINK2=$(OUT)$/bin$/$(DLLPRE)python$(DLLPOST)
+.ELSE
 BUILD_DIR=$(DSP_DIR)
 CONFIGURE_DIR=$(DSP_DIR)
 
@@ -146,14 +157,17 @@
 	"winsound - Win32 Release"
 .ENDIF
 .ENDIF
+.ENDIF
 
 PYVERSIONFILE=$(MISC)$/pyversion.mk
 
 # --- Targets ------------------------------------------------------
 
 .IF "$(GUI)" != "UNX"
+.IF "$(COM)"!="GCC"
 PYCONFIG=$(MISC)$/build$/pyconfig.h
 .ENDIF
+.ENDIF
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
@@ -223,6 +237,19 @@
 .ELSE
 	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
 .ENDIF
+.ELSE
+.IF "$(COM)"=="GCC"
+$(PYTHONCORESHL) : makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+	cp $(MISC)$/build$/$(TARFILE_NAME)$/python$(PYMAJOR)$(PYMINOR).dll $@
+
+$(PYTHONCORELINK1) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	-rm -f $@
+	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
+
+$(PYTHONCORELINK2) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	-rm -f $@
+	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
+.ENDIF
 .ENDIF
 
 $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
@@ -230,4 +257,3 @@
 	cat $? > $@
 
 patch : $(MISC)$/convert_dos_flag
-
--- oo_1.1.1_src/pyuno/source/module/makefile.mk.orig	2004-01-28 21:16:32.000000000 +0900
+++ oo_1.1.1_src/pyuno/source/module/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -65,8 +65,8 @@
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
 .INCLUDE :  pyversion.mk
+.INCLUDE :  settings.mk
 #-------------------------------------------------------------------
 
 CFLAGS+=-I$(SOLARINCDIR)$/python
@@ -82,13 +82,9 @@
 # so this library cannot be checked
 SHL1NOCHECK=yes
 PYUNORC=pyunorc
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
-PYTHONLIB=-lpython
-.ENDIF
 .ELSE
 # on windows, the python executable also uses the shared library,
 # so we link pyuno directly to it
-PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
 PYUNORC=pyuno.ini
 .ENDIF
 
--- oo_1.1.1_src/pyuno/source/loader/makefile.mk.orig	2004-01-10 03:24:14.000000000 +0900
+++ oo_1.1.1_src/pyuno/source/loader/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -65,11 +65,11 @@
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  pyversion.mk
 .INCLUDE :  settings.mk
 
 DLLPRE = 
 
-.INCLUDE :  pyversion.mk
 #-------------------------------------------------------------------
 
 CFLAGS+=-I$(SOLARINCDIR)$/python
@@ -79,14 +79,6 @@
 DIRECT = $(LINKFLAGSDEFS)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-PYUNOLIB=-lpyuno
-PYTHONLIB=-lpython
-.ELSE
-PYUNOLIB=ipyuno.lib
-PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
-.ENDIF
-
 SHL1TARGET=	$(TARGET)
 
 SHL1STDLIBS= \
@@ -143,6 +135,10 @@
 .IF "$(OS)"=="MACOSX"
 	+cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
 .ELSE
+.IF "$(GUI)$(COM)"=="WNTGCC"
+	+cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
+.ELSE
 	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
 .ENDIF    # $(OS)=="MACOSX"
+.ENDIF    # $(OS)=="MACOSX"
 	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb
--- oo_1.1.1_src/readlicense_oo/html/makefile.mk.orig	2003-07-17 03:00:30.000000000 +0900
+++ oo_1.1.1_src/readlicense_oo/html/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -73,7 +73,7 @@
 
 # --- Files --------------------------------------------------------
 
-all: $(MISC)$/THIRDPARTYLICENSEREADME.html
+all: $(MISC)$/THIRDPARTYLICENSEREADME.html $(MISC)$/InstGuide_11_win.pdf
 
 # --- Targets ------------------------------------------------------
 
@@ -81,6 +81,8 @@
 
 $(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
 	+-$(COPY) THIRDPARTYLICENSEREADME.html $@
+$(MISC)$/InstGuide_11_win.pdf: InstGuide_11_win.pdf
+	+-$(COPY) InstGuide_11_win.pdf $@
 
 
 
--- oo_1.1.1_src/sablot/makefile.mk.orig	2003-04-24 22:34:26.000000000 +0900
+++ oo_1.1.1_src/sablot/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -67,11 +67,12 @@
 
 # --- Settings -----------------------------------------------------
 
+.IF "$(COM)"=="GCC"
+CFLAGSCXX+=-frtti
+.ELSE
 .IF "$(GUI)"=="WNT"
 CFLAGS+=-GR
 .ENDIF
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-frtti
 .ENDIF
 
 .INCLUDE :	settings.mk
--- oo_1.1.1_src/sal/util/makefile.mk.orig	2003-07-17 02:23:32.000000000 +0900
+++ oo_1.1.1_src/sal/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -124,19 +124,13 @@
 SHL1VERSIONMAP=	$(TARGET).map
 
 .IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
 SHL1STDLIBS=	\
-				uwinapi.lib\
-				advapi32.lib\
-				wsock32.lib\
-				mpr.lib\
-				shell32.lib\
-				comdlg32.lib\
-				user32.lib\
-				ole32.lib
-.ELSE
-SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32
-.ENDIF # GCC
+				$(UWINAPILIB)\
+				$(ADVAPI32LIB)\
+				$(WSOCK32LIB)\
+				$(MPRLIB)\
+				$(SHELL32LIB)\
+				$(OLE32LIB)
 .ENDIF # WNT
 
 .IF "$(GUI)"=="MAC"
@@ -175,8 +169,12 @@
 SHL1OBJS= \
     $(OBJ)$/dllentry.obj
 .ELSE
+.IF "$(GUI)"!="WNT" || "$(COM)"!="GCC"
 SHL1OBJS= \
     $(SLO)$/dllentry.obj
+.ELSE
+SHL1OBJS=
+.ENDIF
 .ENDIF # MAC
 .ENDIF # UNX
 .ENDIF # lincinc
--- oo_1.1.1_src/sal/systools/win32/uwinapi/makefile.mk.orig	2003-06-12 18:47:28.000000000 +0900
+++ oo_1.1.1_src/sal/systools/win32/uwinapi/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -130,9 +130,15 @@
 SHL1IMPLIB=$(SHL1TARGET)
 SHL1DEF=$(MISC)/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
+.IF "$(COM)"=="GCC"
+DEF1EXPORTFILE=\
+	$(SHL1TARGET)_mingw.dxp\
+	unicows_mingw.dxp
+.ELSE
 DEF1EXPORTFILE=\
 	$(SHL1TARGET).dxp\
 	unicows.dxp
+.ENDIF
 DEF1DEPN=\
 		$(DEF1EXPORTFILE)\
 		makefile.mk
@@ -143,16 +149,24 @@
 #No default libraries
 STDSHL=
 
+.IF "$(COM)"=="GCC"
 SHL1STDLIBS=\
-		unicows.lib\
-		kernel32.lib\
-		user32.lib\
-		advapi32.lib\
-		version.lib\
-		msvcrt.lib
+		-lmingw32 \
+		-lgcc
+.ELSE
+SHL1STDLIBS=
+.ENDIF
+
+SHL1STDLIBS+=\
+		$(UNICOWSLIB)\
+		$(KERNEL32LIB)\
+		$(USER32LIB)\
+		$(ADVAPI32LIB)\
+		$(VERSIONLIB)\
+		$(MSVCRTLIB)
 
-		
 .ENDIF
 
+
 .INCLUDE : target.mk
 
--- oo_1.1.1_src/sal/systools/win32/guistdio/makefile.mk.orig	2003-05-29 00:56:56.000000000 +0900
+++ oo_1.1.1_src/sal/systools/win32/guistdio/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -81,7 +81,7 @@
 APP1OBJS=$(OBJFILES)
 APP1TARGET=$(TARGET)
 
-STDLIB1=\
+STDLIB1=
 
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/salhelper/test/rtti/makefile.mk.orig	2003-06-12 18:58:38.000000000 +0900
+++ oo_1.1.1_src/salhelper/test/rtti/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -81,8 +81,10 @@
 
 #RTTI on
 .IF "$(OS)" == "WNT"
+.IF "$(COM)" != "GCC"
 CFLAGS+= -GR
 .ENDIF
+.ENDIF
 
 SLOFILES=	\
 		$(SLO)$/samplelibrtti.obj
--- oo_1.1.1_src/salhelper/test/dynamicloader/makefile.mk.orig	2001-06-01 17:43:14.000000000 +0900
+++ oo_1.1.1_src/salhelper/test/dynamicloader/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -81,8 +81,10 @@
 
 #RTTI on
 .IF "$(OS)" == "WNT"
+.IF "$(COM)" != "GCC"
 CFLAGS+= -GR
 .ENDIF
+.ENDIF
 
 
 # UNOTYPES= com.sun.star.lang.XInitialization \
--- oo_1.1.1_src/salhelper/test/Symbols/makefile.mk.orig	2003-03-27 02:23:18.000000000 +0900
+++ oo_1.1.1_src/salhelper/test/Symbols/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -79,8 +79,10 @@
 
 #RTTI on
 .IF "$(OS)" == "WNT"
+.IF "$(COM)" != "GCC"
 CFLAGS+= -GR
 .ENDIF
+.ENDIF
 
 
 #---------------------------------------------------------------------------
--- oo_1.1.1_src/salhelper/source/makefile.mk.orig	2004-01-28 20:45:52.000000000 +0900
+++ oo_1.1.1_src/salhelper/source/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -77,7 +77,9 @@
 .INCLUDE :  settings.mk
 
 .IF "$(OS)" == "WNT"
+.IF "$(COM)" != "GCC"
 CFLAGS+= -GR # enable RTTI
+.ENDIF
 .ENDIF # WNT
 
 # --- Files --------------------------------------------------------
@@ -118,6 +120,8 @@
 SHL1VERSIONMAP=lngi.map
 .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
 SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(GUI)$(COM)"=="WNTGCC"
+SHL1VERSIONMAP=gcc3_linux_intel.map
 .ENDIF
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/sc/util/makefile.mk.orig	2003-08-15 20:52:48.000000000 +0900
+++ oo_1.1.1_src/sc/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -149,8 +149,10 @@
 SHL1LIBS=   $(LIB3TARGET) $(LIB4TARGET)
 
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"!="GCC"
 SHL1OBJS=   $(SLO)$/scdll.obj
 .ENDIF
+.ENDIF
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
@@ -273,8 +275,10 @@
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL1TARGET)                                  >$@
+.IF "$(COM)"!="GCC"
     @echo DESCRIPTION 'SCALC3 DLL'                                 >>$@
     @echo DATA        READ WRITE NONSHARED                          >>$@
+.ENDIF
     @echo EXPORTS                                                   >>$@
     @echo   CreateScDocShellDll @20                            >>$@
     @echo   CreateObjScDocShellDll @21                         >>$@
--- oo_1.1.1_src/sc/addin/rot13/makefile.mk.orig	2003-04-15 23:23:08.000000000 +0900
+++ oo_1.1.1_src/sc/addin/rot13/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -93,8 +93,8 @@
 DEF1NAME=$(SHL1TARGET)
 
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS=     gdi32.lib advapi32.lib comdlg32.lib \
-				 uuid.lib ole32.lib shell32.lib winspool.lib
+SHL1STDLIBS=     $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
+				 $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
 .IF "$(GVER)" == "W40"
 SHL1STDLIBS=    $(SHL1STDLIBS) comctl32.lib
 .ENDIF # W40
--- oo_1.1.1_src/sc/addin/datefunc/makefile.mk.orig	2003-03-27 03:03:16.000000000 +0900
+++ oo_1.1.1_src/sc/addin/datefunc/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -92,8 +92,8 @@
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS=     gdi32.lib advapi32.lib comdlg32.lib \
-				 uuid.lib ole32.lib shell32.lib winspool.lib
+SHL1STDLIBS=     $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
+				 $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
 .IF "$(GVER)" == "W40"
 SHL1STDLIBS=    $(SHL1STDLIBS) comctl32.lib
 .ENDIF
@@ -146,8 +146,10 @@
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL1TARGET)>$@
+.IF "$(COM)"!="GCC"
     @echo DESCRIPTION 'DateF StarCalc Addin DLL'>>$@
     @echo DATA        READ WRITE NONSHARED>>$@
+.ENDIF
     @echo EXPORTS>>$@
     @echo     GetFunctionCount>>$@
     @echo     GetFunctionData>>$@
--- oo_1.1.1_src/sch/util/makefile.mk.orig	2003-04-15 23:54:04.000000000 +0900
+++ oo_1.1.1_src/sch/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -139,7 +139,9 @@
 SHL1LIBS=   $(LIB3TARGET)
 
 .IF "$(GUI)"!="UNX"
+.IF "$(GUI)$(COM)"!="WNTGCC"
 SHL1OBJS=   $(SLO)$/schdll.obj
+.ENDIF
 .ENDIF # ! UNX
 
 .IF "$(GUI)" == "WNT" || "$(GUI)" == "WIN"
--- oo_1.1.1_src/sch/source/ui/unoidl/makefile.mk.orig	2003-04-05 04:13:56.000000000 +0900
+++ oo_1.1.1_src/sch/source/ui/unoidl/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -77,8 +77,10 @@
 
 
 .IF "$(GUI)" == "WNT"
+.IF "$(COM)" != "COM"
 CFLAGS+=-Zm500
 .ENDIF
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/scptools/util/cui/makefile.mk.orig	2004-02-13 23:24:00.000000000 +0900
+++ oo_1.1.1_src/scptools/util/cui/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -115,12 +115,16 @@
 .IF "$(GUI)"=="UNX"
 APP4STDLIBS		= -lbtstrp
 .ELSE
+.IF "$(COM)"=="GCC"
+APP4STDLIBS		+= -lbtstrp_static
+.ELSE
 APP4STDLIBS		= $(L)$/bootstrp.lib
 .ENDIF
+.ENDIF
 APP4STDLIBS		+= $(SALLIB) $(TOOLSLIB) $(SVTOOLLIB) $(SETUPLIB) $(VOSLIB)
 
 .IF "$(GUI)"=="WNT"
-APP4STDLIBS		+= ws2_32.lib
+APP4STDLIBS		+= $(WS2_32LIB)
 .ENDIF
 
 APP4OBJS		= $(OBJ)$/lzip.obj	\
@@ -135,7 +139,7 @@
 APP5STDLIBS		+= $(CPPULIB)
 .ENDIF
 .IF "$(GUI)"=="WNT"
-APP5STDLIBS		+= ws2_32.lib
+APP5STDLIBS		+= $(WS2_32LIB)
 .ENDIF
 APP5OBJS		= $(OBJ)$/websnooper.obj
 
--- oo_1.1.1_src/sd/util/makefile.mk.orig	2003-08-15 20:50:46.000000000 +0900
+++ oo_1.1.1_src/sd/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -270,8 +270,10 @@
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL1TARGET)                                  >$@
+.IF "$(COM)"!="GCC"
     @echo DESCRIPTION 'SDRAW3 DLL'                                 >>$@
     @echo DATA        READ WRITE NONSHARED                          >>$@
+.ENDIF
     @echo EXPORTS                                                   >>$@
     @echo   CreateSdDrawDocShellDll @20                            >>$@
     @echo   CreateSdGraphicDocShellDll @21                         >>$@
--- oo_1.1.1_src/setup2/win/source/unloader/makefile.mk.orig	2003-03-27 20:10:08.000000000 +0900
+++ oo_1.1.1_src/setup2/win/source/unloader/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -85,7 +85,7 @@
 APP1TARGET=	$(TARGET)
 
 .IF "$(GUI)"=="WNT"
-APP1STDLIBS=	gdi32.lib
+APP1STDLIBS=	$(GDI32LIB)
 .ENDIF
 
 APP1OBJS=	$(OBJ)$/unloader.obj
--- oo_1.1.1_src/setup2/win/source/system/makefile.mk.orig	2003-03-27 20:10:06.000000000 +0900
+++ oo_1.1.1_src/setup2/win/source/system/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -81,7 +81,7 @@
 		$(SLO)$/winos.obj
 
 LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=  $(SLOFILES)
+LIB1OBJFILES=  $(SLOFILES)
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/setup2/util/makefile.mk.orig	2004-01-10 03:53:12.000000000 +0900
+++ oo_1.1.1_src/setup2/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -143,14 +143,16 @@
 	-lXext
 .ENDIF # "$(OS)"!="MACOSX"
 .ELSE  # "$(GUI)"=="UNX"
+.IF "$(COM)"!="GCC"
 SHL1OBJS = $(SLO)$/agenda.obj
+.ENDIF
 SHL1STDLIBS+= $(SVUNZIPDLL)
 .ENDIF # "$(GUI)"=="UNX"
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS += \
-		uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
-		winmm.lib
+		$(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
+		$(WINMMLIB)
 .ENDIF # "$(GUI)"=="WNT"
 
 DEF1NAME    =$(SHL1TARGET)
@@ -200,8 +202,12 @@
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
-APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
-		winmm.lib
+.IF "$(COM)"=="GCC"
+APP2DEPN+= $(LB)$/libset$(UPD)$(DLLPOSTFIX).a
+APP2STDLIBS += -lset$(UPD)$(DLLPOSTFIX)
+.ENDIF
+APP2STDLIBS += $(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
+		$(WINMMLIB)
 .ENDIF # "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
@@ -237,12 +243,14 @@
 	makefile.mk
 
 .IF "$(GUI)" != "UNX"
+.IF "$(GUI)$(COM)" != "WNTGCC"
 APP2OBJS+=\
 		$(OBJ)$/main.obj		\
 		$(OBJ)$/mainwnd.obj		\
 		$(OBJ)$/mainevt.obj		\
 		$(OBJ)$/magenda.obj		\
 		$(OBJ)$/textani.obj
+.ENDIF
 .ENDIF # "$(GUI)" != "UNX"
 
 APP2DEF=   $(MISCX)$/$(TARGET).def
@@ -265,7 +273,11 @@
 APP3TARGET=loader
 
 .IF "$(GUI)"=="WNT"
-APP3STDLIBS=svunzip.lib gdi32.lib advapi32.lib libcmt.lib shell32.lib
+APP3STDLIBS=$(SVUNZIPLIB)
+.IF "$(COM)"!="GCC"
+APP3STDLIBS+=libcmt.lib
+.ENDIF
+APP3STDLIBS+=$(GDI32LIB) $(ADVAPI32LIB) $(SHELL32LIB)
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
@@ -375,9 +387,9 @@
 .IF "$(USE_SHELL)" != "4nt"
 DOLLAR_SIGN=\$$
 REGCOMP_ENV=\
-	setenv CLASSPATH "$(strip $(subst,\,/ $(shell guw.pl echo $(REGCOMP_CLASSPATH))))" && \
+	setenv CLASSPATH "$(strip $(subst,\,/ $(shell $(WRAPCMD) echo $(REGCOMP_CLASSPATH))))" && \
 	setenv PATH "$(PATH):$(JREPATH)"
-MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell guw.pl echo $(SOLARBINDIR))))
+MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR))))
 .ELSE # "$(USE_SHELL)" != "4nt"
 DOLLAR_SIGN=$$
 REGCOMP_ENV=\
--- oo_1.1.1_src/setup2/source/custom/update/makefile.mk.orig	2003-07-17 02:59:52.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/update/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -36,22 +36,14 @@
 
 CFLAGS +=  -DHAVE_EXPAT_H
 
+.IF "$(COM)"=="GCC"
+CFLAGSCXX+=-frtti
+.ELSE
 .IF "$(GUI)"=="WNT"
 CFLAGS+=-GR
 .ENDIF
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-frtti
 .ENDIF
 
-.IF "$(SABLOT3RDLIB)"==""
-.IF "$(GUI)"=="UNX"
-SABLOT3RDLIB=-lsablot
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-SABLOT3RDLIB=sablot.lib
-.ENDIF # wnt
-.ENDIF # sablot3rdlib
-
 .IF "$(OS)"=="MAC"
 SHL1STDLIBS= \
             $(TOOLSLIB)  \
@@ -64,6 +56,8 @@
             $(TOOLSLIB)  \
             $(SALLIB) \
             $(SABLOT3RDLIB) \
+            $(TOOLSLIB)  \
+            $(SALLIB) \
             $(EXPATASCII3RDLIB) \
             $(SETUPLIB)
 .ENDIF
--- oo_1.1.1_src/setup2/source/custom/sample/makefile.mk.orig	2001-12-17 21:40:14.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/sample/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -88,15 +88,17 @@
 
 SHL1TARGET=     $(TARGET)$(VERSION)$(DLLPOSTFIX)
 SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=       $(LIB1TARGET)
+SHL1LIBS=       $(LIB1TARGET)			\
+	$(SLB)$/sicustom.lib
+.IF "$(COM)"!="GCC"
 SHL1OBJS=       $(SLO)$/sample.obj
+.ENDIF
 SHL1DEPN=	$(L)$/itools.lib $(SVLIBDEPEND)
 SHL1STDLIBS=\
 	$(SALLIB) \
 	$(SVLIB)				\
-		itools.lib				\
-		svmem.lib				\
-		$(SLB)$/sicustom.lib
+		$(TOOLSLIB)				\
+		$(SVMEMLIB)
 
 SHL1DEF=    	$(MISC)$/$(SHL1TARGET).def
 
@@ -112,8 +114,10 @@
 	@echo ------------------------------
 	@echo Making: $@
 	@echo LIBRARY	$(TARGET)$(VERSION)$(DLLPOSTFIX)	>$@
+.IF "$(COM)"!="GCC"
 	@echo CODE	PRELOAD MOVEABLE DISCARDABLE		>>$@
 	@echo DATA	PRELOAD SINGLE				>>$@
+.ENDIF
 	@echo EXPORTS						>>$@
 .IF "$(GUI)"=="WIN"
 	@echo _CustomInit					>>$@
--- oo_1.1.1_src/setup2/source/custom/regactivex/makefile.mk.orig	2003-03-27 20:08:24.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/regactivex/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -73,7 +73,11 @@
 # --- Files --------------------------------------------------------
 
 .DIRCACHE=NO
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=-GX
+.ENDIF
 
 SLOFILES =	$(SLO)$/regactivex.obj
 
@@ -81,8 +85,8 @@
 				$(SALLIB)\
 				$(SVTOOLLIB)	\
 				$(TOOLSLIB)		\
-				advapi32.lib\
-				shell32.lib
+				$(ADVAPI32LIB)\
+				$(SHELL32LIB)
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
--- oo_1.1.1_src/setup2/source/custom/reg4msdoc/makefile.mk.orig	2003-04-15 23:00:24.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/reg4msdoc/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -73,7 +73,11 @@
 # --- Files --------------------------------------------------------
 
 .DIRCACHE=NO
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=-GX
+.ENDIF
 
 SRCFILES = preg4msdoc.src
 
@@ -100,8 +104,8 @@
 				$(TOOLSLIB)		\
 				$(CPPULIB)		\
 				$(SALLIB)\
-				advapi32.lib\
-				shell32.lib
+				$(ADVAPI32LIB)\
+				$(SHELL32LIB)
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
--- oo_1.1.1_src/setup2/source/custom/moffice/makefile.mk.orig	2003-04-15 23:00:04.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/moffice/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -89,8 +89,15 @@
 SHL1OBJS +=	$(SLO)$/arch.obj	\
 		$(SLO)$/sifsys.obj
 
+.IF "$(GUI)$(COM)"=="WNTGCC"
+SHL1OBJS += $(SLO)$/winos.obj
+.ENDIF
+
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS += $(SLO)$/winos.obj uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib winmm.lib
+.IF "$(COM)"!="GCC"
+SHL1STDLIBS += $(SLO)$/winos.obj
+.ENDIF
+SHL1STDLIBS += $(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) $(WINMMLIB)
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
--- oo_1.1.1_src/setup2/source/custom/deinst/makefile.mk.orig	2001-12-17 21:35:14.000000000 +0900
+++ oo_1.1.1_src/setup2/source/custom/deinst/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -78,7 +78,7 @@
 				
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= advapi32.lib
+SHL1STDLIBS+= $(ADVAPI32LIB)
 .ENDIF
 SHL1LIBS =	$(SLB)$/$(TARGET).lib $(SLB)$/sicustom.lib
 
@@ -99,8 +99,10 @@
 	@echo -------------------------------------------
 	@echo DEF-File erstellen
 	@echo LIBRARY     $(DLLNAME)	   >$@
+.IF "$(COM)"!="GCC"
 	@echo DESCRIPTION 'DEL DLL'	   >>$@
 	@echo DATA READ WRITE NONSHARED	   >>$@
+.ENDIF
 	@echo EXPORTS			   >>$@
 .IF "$(GUI)"=="WIN"
 	@echo _CustomInit		   >>$@
--- oo_1.1.1_src/sfx2/util/makefile.mk.orig	2003-04-23 01:34:08.000000000 +0900
+++ oo_1.1.1_src/sfx2/util/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -133,12 +133,12 @@
 .IF "$(GUI)"=="WNT"
 
 SHL1STDLIBS+=\
-		uwinapi.lib \
-		advapi32.lib \
-		shell32.lib \
-		gdi32.lib \
-		ole32.lib \
-		uuid.lib
+		$(UWINAPILIB) \
+		$(ADVAPI32LIB) \
+		$(SHELL32LIB) \
+		$(GDI32LIB) \
+		$(OLE32LIB) \
+		$(UUIDLIB)
 
 .ENDIF # WNT
 
--- oo_1.1.1_src/sfx2/source/control/makefile.mk.orig	2002-04-05 20:32:20.000000000 +0900
+++ oo_1.1.1_src/sfx2/source/control/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -77,8 +77,10 @@
 
 # w.g. compilerbugs
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-Od
 .ENDIF
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/sfx2/source/appl/makefile.mk.orig	2004-01-10 02:42:22.000000000 +0900
+++ oo_1.1.1_src/sfx2/source/appl/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -78,8 +78,10 @@
 
 # w.g. compilerbugs
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-Od
 .ENDIF
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/shell/source/win32/workbench/makefile.mk.orig	2001-05-25 17:22:12.000000000 +0900
+++ oo_1.1.1_src/shell/source/win32/workbench/makefile.mk	2004-03-29 12:17:34.000000000 +0900
@@ -79,7 +79,11 @@
 
 # --- Files --------------------------------------------------------
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=/GX
+.ENDIF
 
 OBJFILES1=$(OBJ)$/TestSysShExec.obj
 OBJFILES2=$(OBJ)$/TestSmplMail.obj
--- oo_1.1.1_src/shell/source/win32/sysshell/makefile.mk.orig	2002-07-05 16:23:48.000000000 +0900
+++ oo_1.1.1_src/shell/source/win32/sysshell/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -64,6 +64,7 @@
 
 PRJNAME=SHELL
 TARGET=sysshell
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
 
@@ -71,7 +72,9 @@
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=   $(SLO)$/systemshell.obj
+LIB1OBJFILES=$(SLO)$/systemshell.obj
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1ARCHIV= $(SLB)$/lib$(TARGET).a
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/shell/source/win32/shlxthandler/makefile.mk.orig	2003-03-27 20:16:14.000000000 +0900
+++ oo_1.1.1_src/shell/source/win32/shlxthandler/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -115,18 +115,31 @@
     
 SHL1TARGET=$(TARGET)
 
-SHL1STDLIBS=uwinapi.lib\
-    oleaut32.lib\
-    advapi32.lib\
-    ole32.lib\
-    uuid.lib\
-    shell32.lib\
-    comctl32.lib\
-    gdi32.lib
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=-luwinapi\
+    -loleaut32\
+    -ladvapi32\
+    -lole32\
+    -luuid\
+    -lshell32\
+    -lcomctl32\
+    -lgdi32\
+    $(STATIC) -lzlib_static\
+    -lexpat_xmlparse_static\
+    -lexpat_xmltok_static $(DYNAMIC)
+.ELSE
+SHL1STDLIBS=$(ZLIB3RDLIB)\
+    $(EXPAT3RDLIB)\
+    $(UWINAPILIB)\
+    $(OLEAUT32LIB)\
+    $(ADVAPI32LIB)\
+    $(OLE32LIB)\
+    $(UUIDLIB)\
+    $(SHELL32LIB)\
+    $(COMCTL32LIB)\
+    $(GDI32LIB)
     
-SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
-    $(SOLARLIBDIR)$/expat_xmlparse.lib\
-    $(SOLARLIBDIR)$/expat_xmltok.lib
+.ENDIF
 
 SHL1DEPN=
 
@@ -141,7 +154,6 @@
 OBJFILES=$(OBJ)$/regsvrex.obj
 APP1TARGET=$(TARGET1)
 APP1OBJS=$(OBJFILES)
-APP1STDLIBS=kernel32.lib
 APP1DEF=$(MISC)$/$(APP1TARGET).def
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/shell/source/win32/makefile.mk.orig	2002-10-01 20:28:28.000000000 +0900
+++ oo_1.1.1_src/shell/source/win32/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -84,9 +84,9 @@
 SHL1STDLIBS=$(CPPULIB)\
 			$(CPPUHELPERLIB)\
 			$(SALLIB)\
-			uwinapi.lib \
-			advapi32.lib \
-			shell32.lib
+ 			$(UWINAPILIB) \
+			$(ADVAPI32LIB) \
+			$(SHELL32LIB)
 
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
--- oo_1.1.1_src/shell/source/tools/lngconvex/makefile.mk.orig	2003-03-27 20:16:08.000000000 +0900
+++ oo_1.1.1_src/shell/source/tools/lngconvex/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -74,7 +74,11 @@
 
 # --- Files --------------------------------------------------------
 
+.IF "$(COM)"=="GCC"
+CFLAGS+=-fno-inline -D_NTSDK
+.ELSE
 CFLAGS+=-Ob0 -D_NTSDK
+.ENDIF
 
 APP1TARGET=$(TARGET)
 APP1OBJS=$(OBJ)$/$(TARGET).obj\
@@ -86,8 +90,11 @@
 
 APP1STDLIBS= $(SALLIB)\
 			$(TOOLSLIB)\
-			$(SOLARLIBDIR)$/atools.lib\
-			msvcprt.lib
+			$(TOOLSLIBST)
+
+.IF "$(COM)"!="GCC"
+APP1STDLIBS+= msvcprt.lib
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
--- oo_1.1.1_src/so3/util/makefile.mk.orig	2003-04-18 02:19:44.000000000 +0900
+++ oo_1.1.1_src/so3/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -122,7 +122,7 @@
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= \
-			ole32.lib uuid.lib advapi32.lib gdi32.lib
+			$(OLE32LIB) $(UUIDLIB) $(ADVAPI32LIB) $(GDI32LIB)
 .ENDIF
 
 .IF "$(GUI)"=="WIN"
@@ -135,7 +135,7 @@
 SHL1STDLIBS+=$(SJLIB)
 .ENDIF
 
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX"||"$(GUI)$(COM)"=="WNTGCC"
 SHL1DEPN=	$(L)$/itools.lib $(LIB1TARGET)
 .ELSE
 SHL1DEPN=	$(L)$/itools.lib $(LIB1TARGET)
@@ -143,10 +143,12 @@
 
 .IF "$(linkinc)" == ""
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 SHL1OBJS+=	$(SLO)$/so2dll.obj					\
 			$(SHLOBJECTS)
 
 .ENDIF
+.ENDIF
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 .ELSE			#"$(linkinc)" == ""
--- oo_1.1.1_src/soltools/winunistd/makefile.mk.orig	2002-01-08 21:06:02.000000000 +0900
+++ oo_1.1.1_src/soltools/winunistd/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -74,10 +74,12 @@
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 # provide dummy header for generated sources
 $(INCCOM)$/unistd.h : unistd.h
     @+$(COPY) $< $@
 
+.ENDIF # "$(COM)"!="GCC"
 .ENDIF # "$(GUI)"=="WNT"
 
 # --- Targets ------------------------------------------------------
--- oo_1.1.1_src/starmath/util/makefile.mk.orig	2003-04-24 21:59:36.000000000 +0900
+++ oo_1.1.1_src/starmath/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -110,7 +110,9 @@
 SHL1LIBS=   $(SLB)$/starmath.lib
 
 .IF "$(GUI)" != "UNX"
+.IF "$(GUI)$(COM)"!="WNTGCC"
 SHL1OBJS=   $(SLO)$/smdll.obj
+.ENDIF
 .ENDIF # ! UNX
 
 .IF "$(GUI)" == "WNT"
--- oo_1.1.1_src/stlport/makefile.mk.orig	2004-01-28 19:52:04.000000000 +0900
+++ oo_1.1.1_src/stlport/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -83,26 +83,27 @@
 		TARFILE_NAME=STLport-4.0
 		PATCH_FILE_NAME=STLport-4.0.macosx.patch
 	.ELSE
-		TARFILE_NAME=STLport-4.0
-		PATCH_FILE_NAME=STLport-4.0.patch
+		.IF "$(GUI)"=="WNT"
+			.IF "$(CCNUMVER)"<="001300000000"
+				TARFILE_NAME=STLport-4.0
+				PATCH_FILE_NAME=STLport-4.0.patch
+			.ELSE			# "$(CCNUMVER)"<="001300000000"
+				TARFILE_NAME=STLport-4.5-0119
+				PATCH_FILE_NAME=STLport-4.5-0119.patch
+			.ENDIF			# "$(CCNUMVER)"<="001300000000"
+		.ELSE
+			TARFILE_NAME=STLport-4.0
+			PATCH_FILE_NAME=STLport-4.0.patch
+		.ENDIF
 	.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(COMID)"=="gcc3"
 
-.IF "$(GUI)"=="WNT"
-.IF "$(CCNUMVER)"<="001300000000"
-TARFILE_NAME=STLport-4.0
-PATCH_FILE_NAME=STLport-4.0.patch
-.ELSE			# "$(CCNUMVER)"<="001300000000"
-TARFILE_NAME=STLport-4.5-0119
-PATCH_FILE_NAME=STLport-4.5-0119.patch
-.ENDIF			# "$(CCNUMVER)"<="001300000000"
-.ENDIF
 
 .IF "$(USE_SHELL)"=="4nt"
 TAR_EXCLUDES=*/SC5/*
 .ENDIF          # "$(USE_SHELL)"=="4nt"
 
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak
+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/gcc-3.0-mingw.mak
 
 
 CONFIGURE_ACTION=none
@@ -126,6 +127,8 @@
 			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
 		.ELIF "$(OS)"=="MACOSX"
 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
+		.ELIF "$(GUI)"=="WNT"
+			BUILD_FLAGS=-f gcc-3.0-mingw.mak
 		.ELSE
 			BUILD_FLAGS=-f gcc-3.0.mak
 		.ENDIF
@@ -168,6 +171,15 @@
     stlport
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+
+OUT2LIB= \
+    lib$/lib*.a
+
+OUT2BIN= \
+    lib$/*.dll
+
+.ELSE
 
 OUT2LIB= \
     lib$/*.lib
@@ -176,6 +188,7 @@
     lib$/*.dll \
     lib$/*.pdb
 
+.ENDIF
 .ELSE          # "$(GUI)"=="WNT"
 
 OUT2LIB= \
@@ -197,6 +210,8 @@
 .INCLUDE :	tg_ext.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+.ELSE
 .IF "$(CCNUMVER)"<="001300000000"
 
 $(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
@@ -228,3 +243,4 @@
 .ENDIF			# "$(USE_NEW_SDK)"!=""
 .ENDIF			# COMVER<=001300000000
 .ENDIF          # "$(GUI)"=="WNT"
+.ENDIF
--- oo_1.1.1_src/stoc/source/javavm/makefile.mk.orig	2003-04-24 01:10:42.000000000 +0900
+++ oo_1.1.1_src/stoc/source/javavm/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -108,7 +108,7 @@
         $(SALHELPERLIB)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS += advapi32.lib
+SHL1STDLIBS += $(ADVAPI32LIB)
 .ENDIF
 
 SHL1DEPN=		
--- oo_1.1.1_src/store/util/makefile.mk.orig	2004-01-29 01:01:52.000000000 +0900
+++ oo_1.1.1_src/store/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -102,12 +102,16 @@
 
 # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
 .IF "$(COMID)"=="gcc3"
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= 	-lsupc++
+.ELSE
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX"
 SHL1STDLIBS+= 	-lsupc++
 .ELSE
 SHL1STDLIBS+= 	-lsupc++ -lgcc_s
 .ENDIF
 .ENDIF
+.ENDIF
 
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/svtools/util/makefile.mk.orig	2004-01-20 20:05:14.000000000 +0900
+++ oo_1.1.1_src/svtools/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -86,18 +86,22 @@
 LIB2OBJFILES= $(OBJ)$/filearch.obj
 
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"!="GCC"
 LIB3TARGET= $(LB)$/svtool.lib
 LIB3FILES=	$(LB)$/_svt.lib
 LIB3OBJFILES=\
 	$(OBJ)$/rtfkey2.obj
 .ENDIF
+.ENDIF
 
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"!="GCC"
 LIB4TARGET= $(LB)$/isvl.lib
 LIB4FILES=	$(LB)$/_isvl.lib
 LIB4OBJFILES=\
 	$(OBJ)$/htmlkey2.obj
 .ENDIF
+.ENDIF
 
 LIB7TARGET= $(SLB)$/svt.lib
 LIB7FILES=	\
@@ -209,13 +213,12 @@
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= \
-		uwinapi.lib \
-		$(LIBPRE) advapi32.lib	\
-		$(LIBPRE) gdi32.lib \
-		ole32.lib 	\
-		uuid.lib 	\
-		advapi32.lib	\
-		oleaut32.lib
+		$(UWINAPILIB) \
+		$(ADVAPI32LIB) \
+		$(GDI32LIB) \
+		$(OLE32LIB) 	\
+		$(UUIDLIB) 	\
+		$(OLEAUT32LIB)
 .ENDIF # WNT
 
 SHL1LIBS= \
@@ -250,9 +253,9 @@
 
 .IF "$(GUI)"=="WNT"
 SHL2STDLIBS+= \
-		uwinapi.lib \
-		$(LIBPRE) advapi32.lib	\
-		$(LIBPRE) gdi32.lib
+		$(UWINAPILIB) \
+		$(ADVAPI32LIB) \
+		$(GDI32LIB)
 .ENDIF # WNT
 
 SHL2LIBS=	$(SLB)$/svl.lib
@@ -273,7 +276,12 @@
 				$(OBJ)$/bmpcore.obj
 
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"=="GCC"
+APP1STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
+APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
+.ELSE
 APP1STDLIBS+= svtool.lib
+.ENDIF
 .ELSE
 APP1STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
 APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
@@ -294,7 +302,12 @@
 APP2OBJS	=   $(OBJ)$/g2g.obj
 
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"=="GCC"
+APP2STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
+APP2STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
+.ELSE
 APP2STDLIBS+= svtool.lib
+.ENDIF
 .ELSE
 APP2STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
 APP2STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
@@ -310,9 +323,13 @@
 .IF "$(GUI)"=="UNX"
 SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
 .ELSE
+.IF "$(GUI)$(COM)"=="WNTGCC"
+SVTTARGETS= $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
+.ELSE
 SVTTARGETS= $(LB)$/isvl.lib \
 			$(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
 .ENDIF
+.ENDIF
 
 # just a quick fix - has to be cleaned up some day...
 .IF "$(L10N-framework)"==""
--- oo_1.1.1_src/svx/util/makefile.mk.orig	2003-05-23 17:30:10.000000000 +0900
+++ oo_1.1.1_src/svx/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -114,9 +114,14 @@
 .ENDIF # WNT
 
 .IF "$(BIG_SVX)"==""
+.IF "$(GUI)$(COM)"=="WNTGCC"
+SHL1STDLIBS+=\
+			-ldl$(UPD)$(DLLPOSTFIX)
+.ELSE
 SHL1STDLIBS+=\
 			$(LB)$/dl.lib
 .ENDIF
+.ENDIF
 
 .IF "$(GUI)"=="WNT"
 SHL1DEPN=       $(SLB)$/svx.lib $(LB)$/dl.lib
@@ -138,8 +143,14 @@
 SHL2IMPLIB= dl
 SVXLOKAL+=	$(LB)$/dl.lib
 SHL2BASE  = 0x1db00000
+.IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2STDLIBS= \
-            $(LB)$/svx.lib \
+            -lsvx$(UPD)$(DLLPOSTFIX)
+.ELSE
+SHL2STDLIBS= \
+            $(LB)$/svx.lib
+.ENDIF
+SHL2STDLIBS+= \
             $(SALLIB) \
             $(VOSLIB) \
             $(TOOLSLIB) \
--- oo_1.1.1_src/sw/workben/makefile.mk.orig	2000-09-19 02:15:02.000000000 +0900
+++ oo_1.1.1_src/sw/workben/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -157,8 +157,10 @@
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL2TARGET)                                  >$@
+.IF "$(COM)" != "GCC"
     @echo DESCRIPTION 'StarOne Test-DLL'                                 >>$@
     @echo DATA        READ WRITE NONSHARED                          >>$@
+.ENDIF
     @echo EXPORTS                                                   >>$@
 	@echo CreateWindow @2 					>>$@
 .ENDIF
--- oo_1.1.1_src/sw/util/makefile.mk.orig	2003-08-15 20:47:10.000000000 +0900
+++ oo_1.1.1_src/sw/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -201,7 +201,7 @@
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
-SHL2STDLIBS+= advapi32.lib
+SHL2STDLIBS+= $(ADVAPI32LIB)
 .ENDIF # WNT
 
 #			uno.lib usr.lib sj.lib aofa.lib
@@ -260,8 +260,10 @@
     @echo ------------------------------
     @echo Making: $@
     @echo LIBRARY     $(SHL2TARGET)                                  >$@
+.IF "$(COM)" != "GCC"
     @echo DESCRIPTION 'SWriter4 DLL'                                 >>$@
     @echo DATA        READ WRITE NONSHARED                          >>$@
+.ENDIF
     @echo EXPORTS                                                   >>$@
     @echo   CreateSwDocShellDll @20                            >>$@
     @echo   CreateSwWebDocShellDll @30                            >>$@
--- oo_1.1.1_src/sw/source/filter/ww8/dump/makefile.mk.orig	2000-09-19 02:15:00.000000000 +0900
+++ oo_1.1.1_src/sw/source/filter/ww8/dump/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -94,14 +94,17 @@
 APP1LIBS=$(LIB1TARGET)
 
 .IF "$(GUI)" == "WNT"
-APP1STDLIBS= $(SVTOOLLIB) $(SVLLIB) $(TOOLSLIB) $(SVLIB) svmem.lib so2.lib
+APP1STDLIBS= $(SVTOOLLIB) $(SVLLIB) $(TOOLSLIB) $(SVLIB) $(SVMEMLIB) $(SO2LIB)
 # irtl.lib
 .IF "$(SO3)" == ""
 APP1STDLIBS+= sdstor.lib
 .ELSE
-APP1STDLIBS+= sot.lib
+APP1STDLIBS+= $(SOTLIB)
+.ENDIF
+APP1STDLIBS+= $(OLD32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB)
+.IF "$(COM)" != "GCC"
+APP1STDLIBS+= libci.lib msvcirt.lib
 .ENDIF
-APP1STDLIBS+= ole32.lib oleaut32.lib uuid.lib shell32.lib advapi32.lib libci.lib msvcirt.lib
 .ELSE
 .IF "$(GUI)" == "OS2"
 APP1STDLIBS=sdstor.lib so2.lib svtool.lib $(SVLIB) tools.lib svmem.lib svx.lib
--- oo_1.1.1_src/sysui/source/win32/misc/makefile.mk.orig	2001-06-27 16:16:58.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/misc/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -71,7 +71,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF $(COM)=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=/GX
+.ENDIF
 
 # --- Files -------------------------------------
 
--- oo_1.1.1_src/sysui/source/win32/folderpicker/workbench/makefile.mk.orig	2001-06-08 23:51:20.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/folderpicker/workbench/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -75,7 +75,11 @@
 
 .INCLUDE : ..$/..$/..$/cppumaker.mk
 
+.IF $(COM)=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=/GR /GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/sysui/source/win32/filepicker/workbench/makefile.mk.orig	2001-06-11 15:24:38.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/filepicker/workbench/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -73,7 +73,11 @@
 
 .INCLUDE : ..$/..$/..$/cppumaker.mk
 
+.IF $(COM)=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs
+.ELSE
 CFLAGS+=/GR /GX
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
--- oo_1.1.1_src/sysui/source/win32/filepicker/makefile.mk.orig	2002-10-01 22:04:22.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/filepicker/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -77,7 +77,11 @@
 
 .INCLUDE : ..$/..$/cppumaker.mk
 
+.IF $(COM)=="GCC"
+CFLAGS+=-fexceptions -fno-enforce-eh-specs -D_WIN32_WINNT=0x0500
+.ELSE
 CFLAGS+=/GX /GR /D_WIN32_WINNT=0x0500 
+.ENDIF
 
 # --- Resources ----------------------------------------------------
 
--- oo_1.1.1_src/sysui/source/win32/QuickStart/so/makefile.mk.orig	2003-03-28 01:22:46.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/QuickStart/so/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -84,14 +84,17 @@
 APP1OBJS=$(OBJFILES)
 APP1NOSAL=TRUE
 APP1TARGET=$(TARGET)
-APP1STDLIBS=shell32.lib\
-			ole32.lib\
-			gdi32.lib\
-			oleaut32.lib\
-			comdlg32.lib\
-			kernel32.lib\
-			comsupp.lib\
-			oleaut32.lib
+.IF "$(COM)"=="GCC"
+APP1STDLIBS=-luuid
+.ELSE
+APP1STDLIBS=comsupp.lib
+.ENDIF
+
+APP1STDLIBS+=$(SHELL32LIB)\
+			$(OLE32LIB)\
+			$(GDI32LIB)\
+			$(OLEAUT32LIB)\
+			$(COMDLG32LIB)
 
 APP1NOSVRES=$(RES)$/$(TARGET).res
 
--- oo_1.1.1_src/sysui/source/win32/QuickStart/makefile.mk.orig	2003-03-28 01:22:46.000000000 +0900
+++ oo_1.1.1_src/sysui/source/win32/QuickStart/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -83,14 +83,17 @@
 APP1OBJS=$(OBJFILES)
 APP1NOSAL=TRUE
 APP1TARGET=$(TARGET)
-APP1STDLIBS=shell32.lib\
-			ole32.lib\
-			gdi32.lib\
-			oleaut32.lib\
-			comdlg32.lib\
-			kernel32.lib\
-			comsupp.lib\
-			oleaut32.lib
+.IF "$(COM)"=="GCC"
+APP1STDLIBS=-luuid
+.ELSE
+APP1STDLIBS=comsupp.lib
+.ENDIF
+
+APP1STDLIBS+=$(SHELL32LIB)\
+			$(OLE32LIB)\
+			$(GDI32LIB)\
+			$(OLEAUT32LIB)\
+			$(COMDLG32LIB)
 
 APP1NOSVRES=$(RES)$/$(TARGET).res
 
--- oo_1.1.1_src/tools/util/makefile.mk.orig	2003-08-15 20:30:50.000000000 +0900
+++ oo_1.1.1_src/tools/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -207,11 +207,11 @@
 
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=   shell32.lib     \
-                mpr.lib         \
-                ole32.lib       \
-                uuid.lib        \
-                advapi32.lib
+SHL1STDLIBS+=   $(SHELL32LIB)     \
+                $(MPRLIB)         \
+                $(OLE32LIB)       \
+                $(UUIDLIB)        \
+                $(ADVAPI32IB)
 .ENDIF
 
 DEF1NAME        =$(SHL1TARGET)
--- oo_1.1.1_src/tools/symbol/makefile.mk.orig	2000-09-19 02:03:10.000000000 +0900
+++ oo_1.1.1_src/tools/symbol/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -86,8 +86,13 @@
 
 APP1NOSAL=true
 APP1TARGET=$(TARGET)
+.IF "$(COM)"=="GCC"
+APP1STDLIBS=-ltl$(VERSION)$(DLLPOSTFIX)
+APP1DEPN=$(LB)$/libtl$(VERSION)$(DLLPOSTFIX).a
+.ELSE
 APP1STDLIBS=$(LB)$/itools.lib
 APP1DEPN=$(LB)$/itools.lib
+.ENDIF
 APP1OBJS=$(OBJ)$/symbol.obj
 #APP1DEF=$(MISC)$/$(TARGET).def
 APP1STACK=50000
--- oo_1.1.1_src/ucb/source/ucp/webdav/makefile.mk.orig	2004-01-28 19:15:32.000000000 +0900
+++ oo_1.1.1_src/ucb/source/ucp/webdav/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -135,7 +135,7 @@
 	$(EXPATASCII3RDLIB)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= wsock32.lib
+SHL1STDLIBS+= $(WSOCK32LIB)
 .ENDIF # WNT
 .IF "$(OS)"=="SOLARIS"
 SHL1STDLIBS+= -lnsl -lsocket
--- oo_1.1.1_src/unzip/util/makefile.mk.orig	2004-01-10 04:07:46.000000000 +0900
+++ oo_1.1.1_src/unzip/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -76,11 +76,18 @@
 HXX1EXCL=   -E:*include*
 
 LIB2TARGET= $(SLB)$/svunzip.lib
+.IF "$(GUI)$(COM)"=="WNTGCC"
+LIB2ARCHIV=$(SLB)$/libsvunzip.a
+.ELSE
 LIB2ARCHIV=$(LB)$/libsvunzip.a
+.ENDIF
 LIB2FILES=  \
 			$(SLB)$/unzip.lib
 
 LIB1TARGET= $(LB)$/svunzip.lib
+.IF "$(GUI)$(COM)"=="WNTGCC"
+LIB1ARCHIV=$(LB)$/libsvunzip.a
+.ENDIF
 LIB1FILES=  \
 			$(LB)$/unzip.lib
 
--- oo_1.1.1_src/vcl/util/makefile.mk.orig	2003-08-15 20:26:42.000000000 +0900
+++ oo_1.1.1_src/vcl/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -225,8 +225,10 @@
 
 SHL1LIBS=   $(LIB1TARGET)
 .IF "$(GUI)"!="UNX"
+.IF "$(COM)"!="GCC"
 SHL1OBJS=   $(SLO)$/salshl.obj
 .ENDIF
+.ENDIF
 
 .IF "$(GUI)" != "MAC"
 .IF "$(GUI)" != "UNX"
@@ -246,14 +248,14 @@
 
 .IF "$(GUI)" == "WNT"
 
-SHL1STDLIBS += uwinapi.lib      \
-               gdi32.lib        \
-               winspool.lib     \
-               ole32.lib        \
-               shell32.lib      \
-               advapi32.lib     \
-               apsp.lib         \
-               imm32.lib
+SHL1STDLIBS += $(UWINAPILIB)      \
+               $(GDI32LIB)        \
+               $(WINSPOOLLIB)     \
+               $(OLE32LIB)        \
+               $(SHELL32LIB)      \
+               $(ADVAPI32LIB)     \
+               $(PSPLIB)          \
+               $(IMM32LIB)
 
 .IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
 LINKFLAGSSHL += /ENTRY:LibMain@12
--- oo_1.1.1_src/vos/util/makefile.mk.orig	2001-12-06 23:50:30.000000000 +0900
+++ oo_1.1.1_src/vos/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -105,7 +105,7 @@
 SHL1IMPLIB=i$(TARGET)
 
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS=wsock32.lib $(SALLIB)
+SHL1STDLIBS=$(WSOCK32LIB) $(SALLIB)
 .ELSE
 SHL1STDLIBS=$(SALLIB)
 .ENDIF
@@ -123,11 +123,13 @@
 .ELSE
 .IF "$(GUI)" != "UNX"
 .IF "$(GUI)" != "MAC"
+.IF "$(COM)"!="GCC"
 SHL1OBJS=    \
     $(SLO)$/object.obj
 .ENDIF
 .ENDIF
 .ENDIF
+.ENDIF
 
 SHL1DEPN=
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
--- oo_1.1.1_src/xml2cmp/source/finder/makefile.mk.orig	2003-03-18 22:36:44.000000000 +0900
+++ oo_1.1.1_src/xml2cmp/source/finder/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -92,7 +92,7 @@
 
 .IF "$(GUI)"=="WNT"
 UWINAPILIB=$(0)
-APP1STDLIBS= MSVCIRT.LIB
+#APP1STDLIBS= MSVCIRT.LIB
 .ENDIF
 
 
--- oo_1.1.1_src/xml2cmp/util/makefile.mk.orig	2003-03-18 22:36:44.000000000 +0900
+++ oo_1.1.1_src/xml2cmp/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -81,7 +81,7 @@
 APP1STACK=	1000000
 
 .IF "$(GUI)"=="WNT"
-APP1STDLIBS= MSVCIRT.LIB
+#APP1STDLIBS= MSVCIRT.LIB
 .ENDIF
 
 
--- oo_1.1.1_src/xmlhelp/util/makefile.mk.orig	2003-04-29 01:18:58.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -80,15 +80,6 @@
 CFLAGS+=-GR
 .ENDIF
 
-.IF "$(SABLOT3RDLIB)"==""
-.IF "$(GUI)"=="UNX"
-SABLOT3RDLIB=-lsablot
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-SABLOT3RDLIB=sablot.lib
-.ENDIF # wnt
-.ENDIF # sablot3rdlib
-
 # --- Shared-Library ---------------------------------------------------
 
 SHL1TARGET=$(TARGET)$(UCP_VERSION)
@@ -100,9 +91,9 @@
 SHL1STDLIBS=                     \
 	$(CPPUHELPERLIB)         \
 	$(CPPULIB)               \
+	$(SABLOT3RDLIB)          \
 	$(SALLIB)                \
 	$(VOSLIB)                \
-	$(SABLOT3RDLIB)          \
 	$(EXPATASCII3RDLIB)      \
 	$(UCBHELPERLIB)          \
 	$(BERKELEYLIB)           \
--- oo_1.1.1_src/xmlhelp/source/cxxhelp/util/makefile.mk.orig	2003-04-29 01:18:48.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/source/cxxhelp/util/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -73,8 +73,10 @@
 .INCLUDE :	settings.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 SLOFILES=\
 		$(SLO)$/Decompressor.obj   \
--- oo_1.1.1_src/xmlhelp/source/cxxhelp/test/makefile.mk.orig	2002-09-09 20:13:40.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/source/cxxhelp/test/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -75,8 +75,10 @@
 
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 # --- Files ---
 
--- oo_1.1.1_src/xmlhelp/source/cxxhelp/qe/makefile.mk.orig	2003-04-29 01:18:40.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/source/cxxhelp/qe/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -73,8 +73,10 @@
 .INCLUDE :	settings.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 SLOFILES=\
 		$(SLO)$/ConceptData.obj   \
--- oo_1.1.1_src/xmlhelp/source/cxxhelp/provider/makefile.mk.orig	2003-04-29 01:19:36.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/source/cxxhelp/provider/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -76,8 +76,10 @@
 CFLAGS +=  -DHAVE_EXPAT_H
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"!="GCC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 # --- General -----------------------------------------------------
 
--- oo_1.1.1_src/xmlhelp/source/cxxhelp/db/makefile.mk.orig	2002-09-09 20:16:46.000000000 +0900
+++ oo_1.1.1_src/xmlhelp/source/cxxhelp/db/makefile.mk	2004-03-29 12:17:36.000000000 +0900
@@ -72,11 +72,12 @@
 
 .INCLUDE :	settings.mk
 
+.IF "$(COM)"=="GCC"
+CFLAGSCXX+=-frtti
+.ELSE
 .IF "$(GUI)"=="WNT"
 CFLAGS+=-GR
 .ENDIF
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-frtti
 .ENDIF
 
 # --- Files --------------------------------------------------------