--- ./pyuno/source/module/makefile.mk.orig 2003-08-15 21:39:44.000000000 +0900 +++ ./pyuno/source/module/makefile.mk 2004-01-04 18:45:56.000000000 +0900 @@ -88,7 +88,11 @@ .ELSE # on windows, the python executable also uses the shared library, # so we link pyuno directly to it +.IF "$(COM)"=="GCC" +PYTHONLIB=-lpython +.ELSE PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib +.ENDIF PYUNORC=pyuno.ini .ENDIF --- ./pyuno/source/loader/makefile.mk.orig 2003-08-15 21:38:44.000000000 +0900 +++ ./pyuno/source/loader/makefile.mk 2004-01-05 01:22:10.000000000 +0900 @@ -79,7 +79,7 @@ DIRECT = $(LINKFLAGSDEFS) .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" || "$(GUI)$(COM)" == "WNTGCC" PYUNOLIB=-lpyuno PYTHONLIB=-lpython .ELSE @@ -143,6 +143,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 --- ./python/makefile.mk.orig 2003-08-15 20:22:46.000000000 +0900 +++ ./python/makefile.mk 2004-01-05 01:18:20.000000000 +0900 @@ -77,6 +77,8 @@ BUILD_DIR= +PWDCMD=pwd + .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" .IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" @@ -117,10 +119,19 @@ PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST) .ENDIF .ELSE +.IF "$(COM)"=="GCC" +ADDITIONAL_FILES=Lib/plat-cygwin Python/fileblocks.c +PWDCMD=cygpath -m `pwd` +CONFIGURE_ACTION= sh -c 'DEFS=-mthreads LIBS=-mthreads ./configure --prefix=../python-inst' +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) -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" CONFIGURE_ACTION=wdevenv pcbuild Release BUILD_ACTION=devenv /build Release /project winsound pcbuild.sln /useenv \ $(BUILD_ACTION_SEP) devenv /build Release /project winreg pcbuild.sln /useenv \ @@ -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 @@ -217,6 +231,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) @@ -224,4 +251,3 @@ cat $? > $@ patch : $(MISC)$/convert_dos_flag - --- ./crashrep/source/win32/makefile.mk.orig 2003-06-12 04:24:54.000000000 +0900 +++ ./crashrep/source/win32/makefile.mk 2004-01-12 09:10:28.000000000 +0900 @@ -90,6 +90,16 @@ APP1TARGET=$(TARGET) +.IF "$(COM)"=="GCC" +STDLIB1=\ + -lgdi32\ + -lcomctl32\ + -lcomdlg32\ + -ladvapi32\ + -lwsock32\ + -lpsapi\ + -ldbghelp +.ELSE STDLIB1=\ gdi32.lib\ comctl32.lib\ @@ -97,7 +107,7 @@ advapi32.lib\ wsock32.lib\ dbghelp.lib - +.ENDIF APP1NOSVRES=$(RES)$/$(TARGET).res # --- Targets ------------------------------------------------------ @@ -108,5 +118,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 --- ./embedserv/util/makefile.mk.orig 2003-05-22 18:22:02.000000000 +0900 +++ ./embedserv/util/makefile.mk 2003-12-23 19:11:40.000000000 +0900 @@ -89,6 +89,16 @@ $(SLO)$/esdll.obj \ $(SLO)$/intercept.obj +.IF "$(COM)"=="GCC" +SHL1STDLIBS=\ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + -lole32 \ + -lgdi32 \ + -luuid \ + -loleaut32 +.ELSE SHL1STDLIBS=\ $(SALLIB) \ $(CPPULIB) \ @@ -97,6 +107,7 @@ gdi32.lib \ uuid.lib \ oleaut32.lib +.ENDIF .IF "$(COMEX)"=="8" SHL1STDLIBS+= advapi32.lib \ --- ./jvmaccess/util/makefile.mk.orig 2003-06-12 18:50:08.000000000 +0900 +++ ./jvmaccess/util/makefile.mk 2003-12-27 10:39:06.000000000 +0900 @@ -81,7 +81,11 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) .IF "$(OS)" == "WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS += -ladvapi32 +.ELSE SHL1STDLIBS += advapi32.lib +.ENDIF .ENDIF # WNT .IF "$(COMNAME)" == "msci" @@ -92,6 +96,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3" SHL1VERSIONMAP = gcc3_linux_intel.map +.ELIF "$(GUI)$(COM)" == "WNTGCC" +SHL1VERSIONMAP = mingw.map .ENDIF DEF1NAME = $(SHL1TARGET) --- ./curl/makefile.mk.orig 2003-07-17 02:24:06.000000000 +0900 +++ ./curl/makefile.mk 2003-11-16 19:27:16.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 'CFLAGS=-D_MT LIBS="-lws2_32 -lwinmm -lmingwthrd" .$/configure CONFIGURE_FLAGS= --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" --- ./icu/makefile.mk.orig 2003-07-17 02:26:10.000000000 +0900 +++ ./icu/makefile.mk 2004-01-17 14:10:12.000000000 +0900 @@ -127,6 +127,27 @@ .IF "$(GUI)"=="WNT" CONFIGURE_DIR=source +.IF "$(COM)"=="GCC" +CONFIGURE_ACTION=sh -c '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 @@ -135,7 +156,7 @@ CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh .ENDIF # "$(USE_SHELL)"=="4nt" BUILD_DIR=source -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) wdevenv allinone$/allinone Release BUILD_ACTION=devenv allinone$/allinone.sln /build Release /project all /useenv .ELSE @@ -154,6 +175,7 @@ $(BUILD_DIR)$/..$/bin$/icuuc22.dll \ $(BUILD_DIR)$/..$/bin$/icule22.dll .ENDIF +.ENDIF # --- Targets ------------------------------------------------------ --- ./stlport/makefile.mk.orig 2003-08-15 20:41:10.000000000 +0900 +++ ./stlport/makefile.mk 2004-01-11 15:30:36.000000000 +0900 @@ -80,26 +80,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 +ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-mingw.mak CONFIGURE_ACTION=none @@ -123,6 +124,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 @@ -161,6 +164,15 @@ stlport .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +OUT2LIB= \ + lib$/lib*.a + +OUT2BIN= \ + lib$/*.dll + +.ELSE OUT2LIB= \ lib$/*.lib @@ -169,6 +181,7 @@ lib$/*.dll \ lib$/*.pdb +.ENDIF .ELSE # "$(GUI)"=="WNT" OUT2LIB= \ @@ -195,6 +208,8 @@ +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +.ELSE .IF "$(CCNUMVER)"<="001300000000" $(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches @@ -226,3 +241,4 @@ .ENDIF # "$(USE_NEW_SDK)"!="" .ENDIF # COMVER<=001300000000 .ENDIF # "$(GUI)"=="WNT" +.ENDIF --- ./i18npool/source/search/makefile.mk.orig 2003-04-24 20:07:56.000000000 +0900 +++ ./i18npool/source/search/makefile.mk 2004-01-13 23:15:06.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 --- ./i18npool/source/localedata/data/makefile.mk.orig 2003-07-03 00:07:46.000000000 +0900 +++ ./i18npool/source/localedata/data/makefile.mk 2004-01-13 23:10:18.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) --- ./fpicker/util/makefile.mk.orig 2002-08-26 23:03:30.000000000 +0900 +++ ./fpicker/util/makefile.mk 2004-01-18 02:09:36.000000000 +0900 @@ -79,6 +79,22 @@ SHL1TARGET=$(TARGET1) +.IF "$(COM)"=="GCC" +SHL1STDLIBS=$(CPPULIB)\ + $(CPPUHELPERLIB)\ + $(SALLIB)\ + $(VCLLIB)\ + $(TOOLSLIB)\ + -luwinapi \ + -ladvapi32 \ + -lshell32\ + -lole32\ + -lgdi32\ + -loleaut32\ + -lcomdlg32\ + -lkernel32\ + -loleaut32 +.ELSE SHL1STDLIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB)\ @@ -94,6 +110,7 @@ kernel32.lib\ comsupp.lib\ oleaut32.lib +.ENDIF SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) @@ -113,6 +130,19 @@ SHL2TARGET=$(TARGET2) +.IF "$(COM)"=="GCC" +SHL2STDLIBS=$(CPPULIB)\ + $(CPPUHELPERLIB)\ + $(SALLIB)\ + $(TOOLSLIB)\ + $(VCLLIB)\ + -luwinapi \ + -ladvapi32 \ + -lole32\ + -lgdi32\ + -lshell32\ + -loleaut32 +.ELSE SHL2STDLIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB)\ @@ -125,6 +155,7 @@ shell32.lib\ comsupp.lib\ oleaut32.lib +.ENDIF SHL2DEPN= SHL2IMPLIB=i$(SHL2TARGET) --- ./fpicker/source/win32/misc/makefile.mk.orig 2003-03-26 03:05:08.000000000 +0900 +++ ./fpicker/source/win32/misc/makefile.mk 2004-01-18 02:02:50.000000000 +0900 @@ -64,6 +64,7 @@ PRJNAME=fpicker TARGET=utils LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- --- ./berkeleydb/makefile.mk.orig 2003-06-12 18:50:38.000000000 +0900 +++ ./berkeleydb/makefile.mk 2003-11-04 01:03:06.000000000 +0900 @@ -97,11 +97,27 @@ .ENDIF # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_DIR=out +#relative to CONFIGURE_DIR +CONFIGURE_ACTION=/bin/sh -c 'CFLAGS=-D_MT LDFLAGS="-no-unde""fined" LIBS="-lmingwthrd" ..$/dist$/configure --enable-cxx --enable-java --enable-dynamic --enable-shared --enable-cxx=no' +#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 BUILD_DIR=build_win32 -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" CONFIGURE_DIR=build_win32 CONFIGURE_ACTION=wdevenv Berkeley_DB Release .IF "$(USE_SHELL)"!="4nt" @@ -122,6 +138,7 @@ $(BUILD_DIR)$/Release$/libdb_java32.lib \ $(BUILD_DIR)$/Release$/libdb32.lib +.ENDIF .ENDIF # "$(GUI)"=="WNT" OUT2INC= \ --- ./psprint/util/makefile.mk.orig 2003-04-15 23:34:44.000000000 +0900 +++ ./psprint/util/makefile.mk 2004-01-12 12:08:18.000000000 +0900 @@ -72,8 +72,30 @@ # --- Allgemein ---------------------------------------------------------- .IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" + +LIB1TARGET= $(SLB)$/$(TARGET).lib +LIB1FILES= $(SLB)$/fontsubset.lib + +SHL1TARGET= psp$(UPD)$(DLLPOSTFIX) +SHL1IMPLIB= ipsp +SHL1LIBS=$(LIB1FILES) + +SHL1VERSIONMAP=libpsp_mingw.map + +SHL1STDLIBS=$(SALLIB) + +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 --- ./shell/source/win32/shlxthandler/makefile.mk.orig 2003-03-27 20:16:14.000000000 +0900 +++ ./shell/source/win32/shlxthandler/makefile.mk 2004-01-11 20:06:04.000000000 +0900 @@ -115,6 +115,19 @@ SHL1TARGET=$(TARGET) +.IF "$(COM)"=="GCC" +SHL1STDLIBS=-luwinapi\ + -loleaut32\ + -ladvapi32\ + -lole32\ + -luuid\ + -lshell32\ + -lcomctl32\ + -lgdi32\ + $(STATIC) -lzlib_static\ + -lexpat_xmlparse_static\ + -lexpat_xmltok_static $(DYNAMIC) +.ELSE SHL1STDLIBS=uwinapi.lib\ oleaut32.lib\ advapi32.lib\ @@ -127,6 +140,7 @@ SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib +.ENDIF SHL1DEPN= @@ -141,7 +155,11 @@ OBJFILES=$(OBJ)$/regsvrex.obj APP1TARGET=$(TARGET1) APP1OBJS=$(OBJFILES) +.IF "$(COM)"=="GCC" +APP1STDLIBS=-lkernel32 +.ELSE APP1STDLIBS=kernel32.lib +.ENDIF APP1DEF=$(MISC)$/$(APP1TARGET).def # --- Targets ------------------------------------------------------ --- ./shell/source/win32/makefile.mk.orig 2002-10-01 20:28:28.000000000 +0900 +++ ./shell/source/win32/makefile.mk 2004-01-05 23:03:38.000000000 +0900 @@ -81,12 +81,21 @@ SHL1TARGET=$(TARGET) +.IF "$(COM)"=="GCC" SHL1STDLIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB)\ - uwinapi.lib \ + -luwinapi \ + -ladvapi32 \ + -lshell32 +.ELSE +SHL1STDLIBS=$(CPPULIB)\ + $(CPPUHELPERLIB)\ + $(SALLIB)\ + uwinapi.lib \ advapi32.lib \ shell32.lib +.ENDIF SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) --- ./shell/source/tools/lngconvex/makefile.mk.orig 2003-03-27 20:16:08.000000000 +0900 +++ ./shell/source/tools/lngconvex/makefile.mk 2004-01-10 16:08:52.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\ @@ -84,10 +88,16 @@ # symbols if we compiler with exceptions # only valid for a tool like this +.IF "$(COM)"=="GCC" +APP1STDLIBS= $(SALLIB)\ + $(TOOLSLIB) -lstlport_gcc\ + $(STATIC) -latools_static $(DYNAMIC) +.ELSE APP1STDLIBS= $(SALLIB)\ $(TOOLSLIB)\ $(SOLARLIBDIR)$/atools.lib\ msvcprt.lib +.ENDIF # --- Targets ------------------------------------------------------ --- ./sysui/source/win32/QuickStart/so/makefile.mk.orig 2003-03-28 01:22:46.000000000 +0900 +++ ./sysui/source/win32/QuickStart/so/makefile.mk 2004-01-04 17:21:48.000000000 +0900 @@ -84,6 +84,16 @@ APP1OBJS=$(OBJFILES) APP1NOSAL=TRUE APP1TARGET=$(TARGET) +.IF "$(COM)"=="GCC" +APP1STDLIBS=-lshell32\ + -lole32\ + -lgdi32\ + -loleaut32\ + -lcomdlg32\ + -lkernel32\ + -luuid\ + -loleaut32 +.ELSE APP1STDLIBS=shell32.lib\ ole32.lib\ gdi32.lib\ @@ -94,6 +104,7 @@ oleaut32.lib APP1NOSVRES=$(RES)$/$(TARGET).res +.ENDIF # --- Targets ------------------------------------------------------ --- ./sysui/source/win32/QuickStart/makefile.mk.orig 2003-03-28 01:22:46.000000000 +0900 +++ ./sysui/source/win32/QuickStart/makefile.mk 2004-01-04 17:20:36.000000000 +0900 @@ -83,6 +83,16 @@ APP1OBJS=$(OBJFILES) APP1NOSAL=TRUE APP1TARGET=$(TARGET) +.IF "$(COM)"=="GCC" +APP1STDLIBS=-lshell32\ + -lole32\ + -lgdi32\ + -loleaut32\ + -lcomdlg32\ + -lkernel32\ + -luuid\ + -loleaut32 +.ELSE APP1STDLIBS=shell32.lib\ ole32.lib\ gdi32.lib\ @@ -91,6 +101,7 @@ kernel32.lib\ comsupp.lib\ oleaut32.lib +.ENDIF APP1NOSVRES=$(RES)$/$(TARGET).res --- ./soltools/winunistd/makefile.mk.orig 2002-01-08 21:06:02.000000000 +0900 +++ ./soltools/winunistd/makefile.mk 2003-12-14 15:51:28.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 ------------------------------------------------------ --- ./idlc/source/preproc/makefile.mk.orig 2003-03-26 21:11:12.000000000 +0900 +++ ./idlc/source/preproc/makefile.mk 2003-12-14 19:44:22.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= --- ./salhelper/source/makefile.mk.orig 2003-07-17 02:30:46.000000000 +0900 +++ ./salhelper/source/makefile.mk 2003-12-27 10:08:38.000000000 +0900 @@ -118,6 +118,8 @@ SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map +.ELIF "$(GUI)$(COM)"=="WNTGCC" +SHL1VERSIONMAP=mingw.map .ENDIF # --- Targets ------------------------------------------------------ --- ./dtrans/util/makefile.mk.orig 2003-04-15 23:06:12.000000000 +0900 +++ ./dtrans/util/makefile.mk 2004-01-04 14:23:34.000000000 +0900 @@ -86,9 +86,14 @@ $(CPPUHELPERLIB) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+= \ + -luwinapi +.ELSE SHL1STDLIBS+= \ uwinapi.lib .ENDIF +.ENDIF @@ -111,6 +116,16 @@ SHL2LIBS=$(SLB)$/ftransl.lib\ $(SLB)$/dtutils.lib +.IF "$(COM)"=="GCC" +SHL2STDLIBS= \ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB)\ + -luwinapi\ + -ladvapi32\ + -lole32\ + -lgdi32 +.ELSE SHL2STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ @@ -119,6 +134,7 @@ advapi32.lib\ ole32.lib\ gdi32.lib +.ENDIF SHL2IMPLIB=i$(SHL2TARGET) @@ -136,6 +152,20 @@ $(SLB)$/dtobjfact.lib\ $(SLB)$/mtaolecb.lib +SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj + +.IF "$(COM)"=="GCC" +SHL3STDLIBS= \ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB)\ + -luwinapi\ + -ladvapi32\ + -lole32\ + -luuid\ + -loleaut32\ + -lgdi32 +.ELSE SHL3STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ @@ -146,6 +176,7 @@ comsupp.lib\ oleaut32.lib\ gdi32.lib +.ENDIF SHL3IMPLIB=i$(SHL3TARGET) @@ -163,6 +194,18 @@ $(SLB)$/dtobjfact.lib\ $(SLB)$/dtutils.lib +.IF "$(COM)"=="GCC" +SHL4STDLIBS= \ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + -luwinapi\ + -ladvapi32\ + -lole32\ + -luuid\ + -loleaut32\ + -lgdi32 +.ELSE SHL4STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ @@ -173,6 +216,7 @@ comsupp.lib\ oleaut32.lib\ gdi32.lib +.ENDIF SHL4DEPN= SHL4IMPLIB=i$(SHL4TARGET) --- ./dtrans/source/win32/mtaole/makefile.mk.orig 2001-03-14 23:46:34.000000000 +0900 +++ ./dtrans/source/win32/mtaole/makefile.mk 2004-01-04 04:13:28.000000000 +0900 @@ -64,6 +64,7 @@ PRJNAME=dtrans TARGET=mtaolecb LIBTARGET=NO +ENABLE_EXCEPTIONS=YES # --- Settings ---------------------------------- --- ./dtrans/source/win32/misc/makefile.mk.orig 2001-02-27 16:25:58.000000000 +0900 +++ ./dtrans/source/win32/misc/makefile.mk 2004-01-04 13:20:26.000000000 +0900 @@ -66,6 +66,7 @@ TARGET=dtutils LIBTARGET=NO USE_BOUNDCHK= +ENABLE_EXCEPTIONS=YES .IF "$(USE_BOUNDCHK)"=="TR" bndchk=tr --- ./dtrans/source/win32/dtobj/makefile.mk.orig 2003-03-25 23:05:38.000000000 +0900 +++ ./dtrans/source/win32/dtobj/makefile.mk 2004-01-04 13:45:58.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 ------------------------------------------------------ --- ./ucb/source/ucp/webdav/makefile.mk.orig 2003-07-25 20:39:54.000000000 +0900 +++ ./ucb/source/ucp/webdav/makefile.mk 2004-01-04 00:25:10.000000000 +0900 @@ -135,7 +135,11 @@ $(EXPATASCII3RDLIB) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+= -lwsock32 +.ELSE SHL1STDLIBS+= wsock32.lib +.ENDIF .ENDIF # WNT .IF "$(OS)"=="SOLARIS" SHL1STDLIBS+= -lnsl -lsocket --- ./framework/util/makefile.mk.orig 2003-04-15 22:50:08.000000000 +0900 +++ ./framework/util/makefile.mk 2004-01-18 00:56:46.000000000 +0900 @@ -141,12 +141,20 @@ $(SALLIB) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+=\ + -luwinapi \ + -lunicows \ + -ladvapi32 \ + -lkernel32 +.ELSE SHL1STDLIBS+=\ uwinapi.lib \ unicows.lib \ advapi32.lib \ kernel32.lib .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def --- ./xmlhelp/util/makefile.mk.orig 2003-04-29 01:18:58.000000000 +0900 +++ ./xmlhelp/util/makefile.mk 2004-01-18 12:33:12.000000000 +0900 @@ -85,7 +85,11 @@ SABLOT3RDLIB=-lsablot .ENDIF # unx .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SABLOT3RDLIB=-lsablot_static +.ELSE SABLOT3RDLIB=sablot.lib +.ENDIF # gcc .ENDIF # wnt .ENDIF # sablot3rdlib --- ./svtools/util/makefile.mk.orig 2003-08-15 21:02:14.000000000 +0900 +++ ./svtools/util/makefile.mk 2004-01-18 08:19:48.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= \ @@ -204,10 +208,17 @@ .ENDIF .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+= \ + -luwinapi \ + -ladvapi32 \ + -lgdi32 +.ELSE SHL1STDLIBS+= \ uwinapi.lib \ $(LIBPRE) advapi32.lib \ $(LIBPRE) gdi32.lib +.ENDIF .ENDIF # WNT SHL1LIBS= \ @@ -241,10 +252,17 @@ $(SALLIB) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL2STDLIBS+= \ + -luwinapi \ + -ladvapi32 \ + -lgdi32 +.ELSE SHL2STDLIBS+= \ uwinapi.lib \ $(LIBPRE) advapi32.lib \ $(LIBPRE) gdi32.lib +.ENDIF .ENDIF # WNT SHL2LIBS= $(SLB)$/svl.lib @@ -265,7 +283,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) @@ -286,7 +309,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) @@ -302,9 +330,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)"=="" --- ./tools/util/makefile.mk.orig 2003-08-15 20:30:50.000000000 +0900 +++ ./tools/util/makefile.mk 2003-12-27 12:53:46.000000000 +0900 @@ -207,12 +207,20 @@ .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+= -lshell32 \ + -lmpr \ + -lole32 \ + -luuid \ + -ladvapi32 +.ELSE SHL1STDLIBS+= shell32.lib \ mpr.lib \ ole32.lib \ uuid.lib \ advapi32.lib .ENDIF +.ENDIF DEF1NAME =$(SHL1TARGET) DEF1DEPN = \ --- ./tools/symbol/makefile.mk.orig 2000-09-19 02:03:10.000000000 +0900 +++ ./tools/symbol/makefile.mk 2003-12-27 15:51:58.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 --- ./vos/util/makefile.mk.orig 2001-12-06 23:50:30.000000000 +0900 +++ ./vos/util/makefile.mk 2003-12-27 09:42:34.000000000 +0900 @@ -105,7 +105,11 @@ SHL1IMPLIB=i$(TARGET) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS=-lwsock32 $(SALLIB) +.ELSE SHL1STDLIBS=wsock32.lib $(SALLIB) +.ENDIF .ELSE SHL1STDLIBS=$(SALLIB) .ENDIF @@ -123,11 +127,13 @@ .ELSE .IF "$(GUI)" != "UNX" .IF "$(GUI)" != "MAC" +.IF "$(COM)"!="GCC" SHL1OBJS= \ $(SLO)$/object.obj .ENDIF .ENDIF .ENDIF +.ENDIF SHL1DEPN= SHL1DEF= $(MISC)$/$(SHL1TARGET).def --- ./codemaker/source/javamaker/makefile.mk.orig 2001-08-17 22:15:48.000000000 +0900 +++ ./codemaker/source/javamaker/makefile.mk 2003-12-21 10:51:58.000000000 +0900 @@ -76,8 +76,10 @@ # --- Files -------------------------------------------------------- .IF "$(GUI)"=="WNT" +.IF "$(COM)"!="GCC" CFLAGSNOOPT+=-Ob0 .ENDIF +.ENDIF OBJFILES= $(OBJ)$/javamaker.obj \ $(OBJ)$/javaoptions.obj \ --- ./codemaker/source/cppumaker/makefile.mk.orig 2001-08-17 22:15:48.000000000 +0900 +++ ./codemaker/source/cppumaker/makefile.mk 2003-12-21 10:53:04.000000000 +0900 @@ -75,8 +75,10 @@ # --- Files -------------------------------------------------------- .IF "$(GUI)"=="WNT" +.IF "$(COM)"!="GCC" CFLAGSNOOPT+=-Ob0 .ENDIF +.ENDIF OBJFILES= $(OBJ)$/cppumaker.obj \ $(OBJ)$/cppuoptions.obj \ --- ./stoc/source/javavm/makefile.mk.orig 2003-04-24 01:10:42.000000000 +0900 +++ ./stoc/source/javavm/makefile.mk 2004-01-04 02:24:20.000000000 +0900 @@ -108,8 +108,12 @@ $(SALHELPERLIB) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS += -ladvapi32 +.ELSE SHL1STDLIBS += advapi32.lib .ENDIF +.ENDIF SHL1DEPN= SHL1IMPLIB= i$(TARGET) --- ./bridges/source/cpp_uno/msvc_win32_intel/makefile.mk.orig 2001-09-25 18:15:38.000000000 +0900 +++ ./bridges/source/cpp_uno/msvc_win32_intel/makefile.mk 2003-12-23 22:47:24.000000000 +0900 @@ -109,9 +109,9 @@ DEF1NAME= $(SHL1TARGET) +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.ENDIF - --- ./cppuhelper/source/makefile.mk.orig 2003-07-03 00:17:30.000000000 +0900 +++ ./cppuhelper/source/makefile.mk 2003-12-27 10:38:08.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 ------------------------------------------------------ --- ./store/util/makefile.mk.orig 2003-08-15 20:53:20.000000000 +0900 +++ ./store/util/makefile.mk 2003-12-30 22:34:08.000000000 +0900 @@ -102,6 +102,9 @@ # 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" SHL1STDLIBS+= -lsupc++ .ELSE @@ -112,6 +115,7 @@ .ENDIF .ENDIF .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def --- ./sal/util/makefile.mk.orig 2003-07-17 02:23:32.000000000 +0900 +++ ./sal/util/makefile.mk 2003-12-28 11:05:54.000000000 +0900 @@ -135,7 +135,7 @@ user32.lib\ ole32.lib .ELSE -SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32 +SHL1STDLIBS= $(DYNAMIC) -luwinapi -ladvapi32 -lwsock32 -lmpr -lole32 .ENDIF # GCC .ENDIF # WNT @@ -175,8 +175,12 @@ SHL1OBJS= \ $(OBJ)$/dllentry.obj .ELSE +.IF "$(GUI)"!="WNT" || "$(COM)"!="GCC" SHL1OBJS= \ $(SLO)$/dllentry.obj +.ELSE +SHL1OBJS= +.ENDIF .ENDIF # MAC .ENDIF # UNX .ENDIF # lincinc --- ./sal/systools/win32/uwinapi/makefile.mk.orig 2003-06-12 18:47:28.000000000 +0900 +++ ./sal/systools/win32/uwinapi/makefile.mk 2003-11-29 21:12:52.000000000 +0900 @@ -143,6 +143,18 @@ #No default libraries STDSHL= +.IF "$(COM)"=="GCC" +SHL1STDLIBS=\ + -lunicows \ + -lkernel32 \ + -luser32 \ + -ladvapi32 \ + -lversion \ + -lmsvcrt \ + -lmingw32 \ + -lgcc \ + -lversion +.ELSE SHL1STDLIBS=\ unicows.lib\ kernel32.lib\ @@ -150,6 +162,7 @@ advapi32.lib\ version.lib\ msvcrt.lib +.ENDIF .ENDIF --- ./sal/systools/win32/guistdio/makefile.mk.orig 2003-05-29 00:56:56.000000000 +0900 +++ ./sal/systools/win32/guistdio/makefile.mk 2003-11-30 01:54:14.000000000 +0900 @@ -81,7 +81,7 @@ APP1OBJS=$(OBJFILES) APP1TARGET=$(TARGET) -STDLIB1=\ +STDLIB1= # --- Targets ------------------------------------------------------ --- ./so3/util/makefile.mk.orig 2003-04-18 02:19:44.000000000 +0900 +++ ./so3/util/makefile.mk 2004-01-18 11:19:16.000000000 +0900 @@ -121,9 +121,14 @@ .ENDIF .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS+= \ + -lole32 -luuid -ladvapi32 -lgdi32 +.ELSE SHL1STDLIBS+= \ ole32.lib uuid.lib advapi32.lib gdi32.lib .ENDIF +.ENDIF .IF "$(GUI)"=="WIN" SHL1STDLIBS=$(VOSLIB) \ @@ -135,7 +140,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 +148,12 @@ .IF "$(linkinc)" == "" .IF "$(GUI)"=="WNT" +.IF "$(COM)"!="GCC" SHL1OBJS+= $(SLO)$/so2dll.obj \ $(SHLOBJECTS) .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def .ELSE #"$(linkinc)" == "" --- ./vcl/util/makefile.mk.orig 2003-08-15 20:26:42.000000000 +0900 +++ ./vcl/util/makefile.mk 2004-01-12 12:18:12.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,6 +248,16 @@ .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" +SHL1STDLIBS += -luwinapi \ + -lgdi32 \ + -lwinspool \ + -lole32 \ + -lshell32 \ + -ladvapi32 \ + -lpsp$(VERSION)$(DLLPOSTFIX) \ + -limm32 +.ELSE SHL1STDLIBS += uwinapi.lib \ gdi32.lib \ winspool.lib \ @@ -254,6 +266,7 @@ advapi32.lib \ apsp.lib \ imm32.lib +.ENDIF .IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI" LINKFLAGSSHL += /ENTRY:LibMain@12 --- ./idl/util/makefile.mk.orig 2003-03-26 21:08:20.000000000 +0900 +++ ./idl/util/makefile.mk 2003-12-27 15:55:44.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