Attachment #12597 for issue #24588

View | Details | Raw Unified | Return to issue 24588
Collapse All | Expand All

Lines 88-94 Link Here

(-)./pyuno/source/module/makefile.mk.orig (+4 lines)
88	.ELSE	88	.ELSE
89	# on windows, the python executable also uses the shared library,	89	# on windows, the python executable also uses the shared library,
90	# so we link pyuno directly to it	90	# so we link pyuno directly to it
		91	.IF "$(COM)"=="GCC"
		92	PYTHONLIB=-lpython
		93	.ELSE
91	PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib	94	PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
		95	.ENDIF
92	PYUNORC=pyuno.ini	96	PYUNORC=pyuno.ini
93	.ENDIF	97	.ENDIF
94		98

Lines 79-85 Link Here

(-)./pyuno/source/loader/makefile.mk.orig (-1 / +5 lines)
79	DIRECT = $(LINKFLAGSDEFS)	79	DIRECT = $(LINKFLAGSDEFS)
80	.ENDIF	80	.ENDIF
81		81
82	.IF "$(GUI)" == "UNX"	82	.IF "$(GUI)" == "UNX" \|\| "$(GUI)$(COM)" == "WNTGCC"
83	PYUNOLIB=-lpyuno	83	PYUNOLIB=-lpyuno
84	PYTHONLIB=-lpython	84	PYTHONLIB=-lpython
85	.ELSE	85	.ELSE
Lines 143-148 Link Here
143	.IF "$(OS)"=="MACOSX"	143	.IF "$(OS)"=="MACOSX"
144	+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))"	144	+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))"
145	.ELSE	145	.ELSE
		146	.IF "$(GUI)$(COM)"=="WNTGCC"
		147	+cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
		148	.ELSE
146	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))	149	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
147	.ENDIF # $(OS)=="MACOSX"	150	.ENDIF # $(OS)=="MACOSX"
		151	.ENDIF # $(OS)=="MACOSX"
148	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb	152	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb

Lines 77-82 Link Here

(-)./python/makefile.mk.orig (-2 / +28 lines)
77		77
78	BUILD_DIR=	78	BUILD_DIR=
79		79
		80	PWDCMD=pwd
		81
80	.IF "$(GUI)"=="UNX"	82	.IF "$(GUI)"=="UNX"
81	.IF "$(COMNAME)"=="sunpro5"	83	.IF "$(COMNAME)"=="sunpro5"
82	.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"	84	.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
Lines 117-126 Link Here
117	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)	119	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
118	.ENDIF	120	.ENDIF
119	.ELSE	121	.ELSE
		122	.IF "$(COM)"=="GCC"
		123	ADDITIONAL_FILES=Lib/plat-cygwin Python/fileblocks.c
		124	PWDCMD=cygpath -m `pwd`
		125	CONFIGURE_ACTION= sh -c 'DEFS=-mthreads LIBS=-mthreads ./configure --prefix=../python-inst'
		126	BUILD_ACTION=$(ENV_BUILD) setenv PWDCMD "$(PWDCMD)" ; make ; make install
		127	PYTHONCORESHL=$(OUT)$/bin$/$(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST)
		128	PYTHONCORELINK1=$(OUT)$/bin$/$(DLLPRE)python$(PYMAJOR)$(DLLPOST)
		129	PYTHONCORELINK2=$(OUT)$/bin$/$(DLLPRE)python$(DLLPOST)
		130	.ELSE
120	BUILD_DIR=$(DSP_DIR)	131	BUILD_DIR=$(DSP_DIR)
121	CONFIGURE_DIR=$(DSP_DIR)	132	CONFIGURE_DIR=$(DSP_DIR)
122		133
123	.IF "$(COMEX)"=="8"	134	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
124	CONFIGURE_ACTION=wdevenv pcbuild Release	135	CONFIGURE_ACTION=wdevenv pcbuild Release
125	BUILD_ACTION=devenv /build Release /project winsound pcbuild.sln /useenv \	136	BUILD_ACTION=devenv /build Release /project winsound pcbuild.sln /useenv \
126	$(BUILD_ACTION_SEP) devenv /build Release /project winreg pcbuild.sln /useenv \	137	$(BUILD_ACTION_SEP) devenv /build Release /project winreg pcbuild.sln /useenv \
Lines 146-159 Link Here
146	"winsound - Win32 Release"	157	"winsound - Win32 Release"
147	.ENDIF	158	.ENDIF
148	.ENDIF	159	.ENDIF
		160	.ENDIF
149		161
150	PYVERSIONFILE=$(MISC)$/pyversion.mk	162	PYVERSIONFILE=$(MISC)$/pyversion.mk
151		163
152	# --- Targets ------------------------------------------------------	164	# --- Targets ------------------------------------------------------
153		165
154	.IF "$(GUI)" != "UNX"	166	.IF "$(GUI)" != "UNX"
		167	.IF "$(COM)"!="GCC"
155	PYCONFIG=$(MISC)$/build$/pyconfig.h	168	PYCONFIG=$(MISC)$/build$/pyconfig.h
156	.ENDIF	169	.ENDIF
		170	.ENDIF
157		171
158	.INCLUDE : set_ext.mk	172	.INCLUDE : set_ext.mk
159	.INCLUDE : target.mk	173	.INCLUDE : target.mk
Lines 217-222 Link Here
217	.ELSE	231	.ELSE
218	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)	232	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
219	.ENDIF	233	.ENDIF
		234	.ELSE
		235	.IF "$(COM)"=="GCC"
		236	$(PYTHONCORESHL) : makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
		237	cp $(MISC)$/build$/$(TARFILE_NAME)$/python$(PYMAJOR)$(PYMINOR).dll $@
		238
		239	$(PYTHONCORELINK1) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
		240	-rm -f $@
		241	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
		242
		243	$(PYTHONCORELINK2) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
		244	-rm -f $@
		245	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
		246	.ENDIF
220	.ENDIF	247	.ENDIF
221		248
222	$(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)	249	$(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
Lines 224-227 Link Here
224	cat $? > $@	251	cat $? > $@
225		252
226	patch : $(MISC)$/convert_dos_flag	253	patch : $(MISC)$/convert_dos_flag
227

Lines 90-95 Link Here

(-)./crashrep/source/win32/makefile.mk.orig (-2 / +12 lines)
90		90
91	APP1TARGET=$(TARGET)	91	APP1TARGET=$(TARGET)
92		92
		93	.IF "$(COM)"=="GCC"
		94	STDLIB1=\
		95	-lgdi32\
		96	-lcomctl32\
		97	-lcomdlg32\
		98	-ladvapi32\
		99	-lwsock32\
		100	-lpsapi\
		101	-ldbghelp
		102	.ELSE
93	STDLIB1=\	103	STDLIB1=\
94	gdi32.lib\	104	gdi32.lib\
95	comctl32.lib\	105	comctl32.lib\
Lines 97-103 Link Here
97	advapi32.lib\	107	advapi32.lib\
98	wsock32.lib\	108	wsock32.lib\
99	dbghelp.lib	109	dbghelp.lib
100		110	.ENDIF
101	APP1NOSVRES=$(RES)$/$(TARGET).res	111	APP1NOSVRES=$(RES)$/$(TARGET).res
102		112
103	# --- Targets ------------------------------------------------------	113	# --- Targets ------------------------------------------------------
Lines 108-112 Link Here
108	# using lngconvex.exe	118	# using lngconvex.exe
109		119
110	$(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt	120	$(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
111	+lngconvex.exe -lng ..\all\crashrep.lng -rc $(TARGET).rc -c ctrylnglist.txt -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt	121	+$(WRAPCMD) lngconvex.exe -lng ../all/crashrep.lng -rc $(TARGET).rc -c ctrylnglist.txt -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
112		122




		$(SLO)$/esdll.obj \
		$(SLO)$/intercept.obj

.IF "$(COM)"=="GCC"
SHL1STDLIBS=\
    $(SALLIB) 	\
	$(CPPULIB)	\
	$(CPPUHELPERLIB)	\
	-lole32 	\
	-lgdi32 	\
	-luuid 	\
	-loleaut32
.ELSE
SHL1STDLIBS=\
    $(SALLIB) 	\
	$(CPPULIB)	\

	gdi32.lib 	\
	uuid.lib 	\
	oleaut32.lib
.ENDIF

.IF "$(COMEX)"=="8"
SHL1STDLIBS+=  advapi32.lib	\

Lines 81-87 Link Here

(-)./jvmaccess/util/makefile.mk.orig (+6 lines)
81	SHL1LIBS = $(SLB)$/$(TARGET).lib	81	SHL1LIBS = $(SLB)$/$(TARGET).lib
82	SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)	82	SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
83	.IF "$(OS)" == "WNT"	83	.IF "$(OS)" == "WNT"
		84	.IF "$(COM)"=="GCC"
		85	SHL1STDLIBS += -ladvapi32
		86	.ELSE
84	SHL1STDLIBS += advapi32.lib	87	SHL1STDLIBS += advapi32.lib
		88	.ENDIF
85	.ENDIF # WNT	89	.ENDIF # WNT
86		90
87	.IF "$(COMNAME)" == "msci"	91	.IF "$(COMNAME)" == "msci"
Lines 92-97 Link Here
92	SHL1VERSIONMAP = gcc3_linux_intel.map	96	SHL1VERSIONMAP = gcc3_linux_intel.map
93	.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"	97	.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"
94	SHL1VERSIONMAP = gcc3_linux_intel.map	98	SHL1VERSIONMAP = gcc3_linux_intel.map
		99	.ELIF "$(GUI)$(COM)" == "WNTGCC"
		100	SHL1VERSIONMAP = mingw.map
95	.ENDIF	101	.ENDIF
96		102
97	DEF1NAME = $(SHL1TARGET)	103	DEF1NAME = $(SHL1TARGET)






.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

OUT2BIN=$(BUILD_DIR)$/libcurl.dll
OUT2LIB=$(BUILD_DIR)$/libcurl.lib

.ENDIF
.ENDIF			# "$(GUI)"=="WNT"







.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

CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh
.ENDIF			# "$(USE_SHELL)"=="4nt"
BUILD_DIR=source
.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

	$(BUILD_DIR)$/..$/bin$/icuuc22.dll \
	$(BUILD_DIR)$/..$/bin$/icule22.dll
.ENDIF
.ENDIF

# --- Targets ------------------------------------------------------





		TARFILE_NAME=STLport-4.0
		PATCH_FILE_NAME=STLport-4.0.macosx.patch
	.ELSE
		.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$/gcc-3.0-mingw.mak


CONFIGURE_ACTION=none

			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

    stlport

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"

OUT2LIB= \
    lib$/lib*.a

OUT2BIN= \
    lib$/*.dll

.ELSE

OUT2LIB= \
    lib$/*.lib

    lib$/*.dll \
    lib$/*.pdb

.ENDIF
.ELSE          # "$(GUI)"=="WNT"

OUT2LIB= \

	+$(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

.ENDIF			# "$(USE_NEW_SDK)"!=""
.ENDIF			# COMVER<=001300000000
.ENDIF          # "$(GUI)"=="WNT"
.ENDIF

Lines 83-89 Link Here

(-)./i18npool/source/search/makefile.mk.orig (-1 / +1 lines)
83	SHL1TARGET= i18nsearch	83	SHL1TARGET= i18nsearch
84	SHL1OBJS= $(SLOFILES)	84	SHL1OBJS= $(SLOFILES)
85		85
86	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	86	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC" \|\| "$(COM)"=="GCC"
87	I18NREGEXPLIB=-li18nregexp$(COMID)	87	I18NREGEXPLIB=-li18nregexp$(COMID)
88	.ELSE	88	.ELSE
89	I18NREGEXPLIB=ii18nregexp.lib	89	I18NREGEXPLIB=ii18nregexp.lib

Lines 76-83 Link Here

(-)./i18npool/source/localedata/data/makefile.mk.orig (+5 lines)
76		76
77	# macro to link with localedata_en library	77	# macro to link with localedata_en library
78	.IF "$(GUI)" == "WNT"	78	.IF "$(GUI)" == "WNT"
		79	.IF "$(COM)"=="GCC"
		80	LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
		81	LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
		82	.ELSE
79	LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib	83	LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
80	LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib	84	LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
		85	.ENDIF
81	.ELSE	86	.ELSE
82	LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)	87	LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
83	LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)	88	LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)





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)\

			kernel32.lib\
			comsupp.lib\
			oleaut32.lib
.ENDIF

SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)


SHL2TARGET=$(TARGET2)

.IF "$(COM)"=="GCC"
SHL2STDLIBS=$(CPPULIB)\
			$(CPPUHELPERLIB)\
			$(SALLIB)\
			$(TOOLSLIB)\
			$(VCLLIB)\
			-luwinapi \
			-ladvapi32 \
			-lole32\
			-lgdi32\
			-lshell32\
			-loleaut32
.ELSE
SHL2STDLIBS=$(CPPULIB)\
			$(CPPUHELPERLIB)\
			$(SALLIB)\

			shell32.lib\
			comsupp.lib\
			oleaut32.lib
.ENDIF

SHL2DEPN=
SHL2IMPLIB=i$(SHL2TARGET)

Lines 64-69 Link Here

(-)./fpicker/source/win32/misc/makefile.mk.orig (+1 lines)
64	PRJNAME=fpicker	64	PRJNAME=fpicker
65	TARGET=utils	65	TARGET=utils
66	LIBTARGET=NO	66	LIBTARGET=NO
		67	ENABLE_EXCEPTIONS=TRUE
67		68
68	# --- Settings ----------------------------------	69	# --- Settings ----------------------------------
69		70




.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" || "$(COMEX)"=="10"
CONFIGURE_DIR=build_win32
CONFIGURE_ACTION=wdevenv Berkeley_DB Release
.IF "$(USE_SHELL)"!="4nt"

	$(BUILD_DIR)$/Release$/libdb_java32.lib \
	$(BUILD_DIR)$/Release$/libdb32.lib

.ENDIF
.ENDIF			# "$(GUI)"=="WNT"

OUT2INC= \




# --- 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




    
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\

SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
    $(SOLARLIBDIR)$/expat_xmlparse.lib\
    $(SOLARLIBDIR)$/expat_xmltok.lib
.ENDIF

SHL1DEPN=


OBJFILES=$(OBJ)$/regsvrex.obj
APP1TARGET=$(TARGET1)
APP1OBJS=$(OBJFILES)
.IF "$(COM)"=="GCC"
APP1STDLIBS=-lkernel32
.ELSE
APP1STDLIBS=kernel32.lib
.ENDIF
APP1DEF=$(MISC)$/$(APP1TARGET).def

# --- Targets ------------------------------------------------------





SHL1TARGET=$(TARGET)

.IF "$(COM)"=="GCC"
SHL1STDLIBS=$(CPPULIB)\
			$(CPPUHELPERLIB)\
			$(SALLIB)\
 			-luwinapi \
			-ladvapi32 \
			-lshell32
.ELSE
SHL1STDLIBS=$(CPPULIB)\
			$(CPPUHELPERLIB)\
			$(SALLIB)\
 			uwinapi.lib \
			advapi32.lib \
			shell32.lib
.ENDIF

SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)

Lines 74-80 Link Here

(-)./shell/source/tools/lngconvex/makefile.mk.orig (+10 lines)
74		74
75	# --- Files --------------------------------------------------------	75	# --- Files --------------------------------------------------------
76		76
		77	.IF "$(COM)"=="GCC"
		78	CFLAGS+=-fno-inline -D_NTSDK
		79	.ELSE
77	CFLAGS+=-Ob0 -D_NTSDK	80	CFLAGS+=-Ob0 -D_NTSDK
		81	.ENDIF
78		82
79	APP1TARGET=$(TARGET)	83	APP1TARGET=$(TARGET)
80	APP1OBJS=$(OBJ)$/$(TARGET).obj\	84	APP1OBJS=$(OBJ)$/$(TARGET).obj\
Lines 84-93 Link Here
84	# symbols if we compiler with exceptions	88	# symbols if we compiler with exceptions
85	# only valid for a tool like this	89	# only valid for a tool like this
86		90
		91	.IF "$(COM)"=="GCC"
		92	APP1STDLIBS= $(SALLIB)\
		93	$(TOOLSLIB) -lstlport_gcc\
		94	$(STATIC) -latools_static $(DYNAMIC)
		95	.ELSE
87	APP1STDLIBS= $(SALLIB)\	96	APP1STDLIBS= $(SALLIB)\
88	$(TOOLSLIB)\	97	$(TOOLSLIB)\
89	$(SOLARLIBDIR)$/atools.lib\	98	$(SOLARLIBDIR)$/atools.lib\
90	msvcprt.lib	99	msvcprt.lib
		100	.ENDIF
91		101
92	# --- Targets ------------------------------------------------------	102	# --- Targets ------------------------------------------------------
93		103




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\

			oleaut32.lib

APP1NOSVRES=$(RES)$/$(TARGET).res
.ENDIF

# --- Targets ------------------------------------------------------





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\

			kernel32.lib\
			comsupp.lib\
			oleaut32.lib
.ENDIF

APP1NOSVRES=$(RES)$/$(TARGET).res


Lines 74-83 Link Here

(-)./soltools/winunistd/makefile.mk.orig (+2 lines)
74	# --- Files --------------------------------------------------------	74	# --- Files --------------------------------------------------------
75		75
76	.IF "$(GUI)"=="WNT"	76	.IF "$(GUI)"=="WNT"
		77	.IF "$(COM)"!="GCC"
77	# provide dummy header for generated sources	78	# provide dummy header for generated sources
78	$(INCCOM)$/unistd.h : unistd.h	79	$(INCCOM)$/unistd.h : unistd.h
79	@+$(COPY) $< $@	80	@+$(COPY) $< $@
80		81
		82	.ENDIF # "$(COM)"!="GCC"
81	.ENDIF # "$(GUI)"=="WNT"	83	.ENDIF # "$(GUI)"=="WNT"
82		84
83	# --- Targets ------------------------------------------------------	85	# --- Targets ------------------------------------------------------

Lines 102-109 Link Here

(-)./idlc/source/preproc/makefile.mk.orig (+2 lines)
102		102
103	APP1TARGET= $(TARGET)	103	APP1TARGET= $(TARGET)
104	.IF "$(GUI)" != "UNX"	104	.IF "$(GUI)" != "UNX"
		105	.IF "$(COM)" != "GCC"
105	APP1OBJS=$(OBJ)$/cpp.obj	106	APP1OBJS=$(OBJ)$/cpp.obj
106	.ENDIF	107	.ENDIF
		108	.ENDIF
107		109
108	APP1LIBS= $(LB)$/idlcpp.lib	110	APP1LIBS= $(LB)$/idlcpp.lib
109	APP1DEPN=	111	APP1DEPN=

Lines 118-123 Link Here

(-)./salhelper/source/makefile.mk.orig (+2 lines)
118	SHL1VERSIONMAP=lngi.map	118	SHL1VERSIONMAP=lngi.map
119	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"	119	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
120	SHL1VERSIONMAP=gcc3_linux_intel.map	120	SHL1VERSIONMAP=gcc3_linux_intel.map
		121	.ELIF "$(GUI)$(COM)"=="WNTGCC"
		122	SHL1VERSIONMAP=mingw.map
121	.ENDIF	123	.ENDIF
122		124
123	# --- Targets ------------------------------------------------------	125	# --- Targets ------------------------------------------------------

Lines 86-94 Link Here

(-)./dtrans/util/makefile.mk.orig (+44 lines)
86	$(CPPUHELPERLIB)	86	$(CPPUHELPERLIB)
87		87
88	.IF "$(GUI)"=="WNT"	88	.IF "$(GUI)"=="WNT"
		89	.IF "$(COM)"=="GCC"
		90	SHL1STDLIBS+= \
		91	-luwinapi
		92	.ELSE
89	SHL1STDLIBS+= \	93	SHL1STDLIBS+= \
90	uwinapi.lib	94	uwinapi.lib
91	.ENDIF	95	.ENDIF
		96	.ENDIF
92		97
93		98
94		99
Lines 111-116 Link Here
111	SHL2LIBS=$(SLB)$/ftransl.lib\	116	SHL2LIBS=$(SLB)$/ftransl.lib\
112	$(SLB)$/dtutils.lib	117	$(SLB)$/dtutils.lib
113		118
		119	.IF "$(COM)"=="GCC"
		120	SHL2STDLIBS= \
		121	$(SALLIB) \
		122	$(CPPULIB) \
		123	$(CPPUHELPERLIB)\
		124	-luwinapi\
		125	-ladvapi32\
		126	-lole32\
		127	-lgdi32
		128	.ELSE
114	SHL2STDLIBS= \	129	SHL2STDLIBS= \
115	$(SALLIB) \	130	$(SALLIB) \
116	$(CPPULIB) \	131	$(CPPULIB) \
Lines 119-124 Link Here
119	advapi32.lib\	134	advapi32.lib\
120	ole32.lib\	135	ole32.lib\
121	gdi32.lib	136	gdi32.lib
		137	.ENDIF
122		138
123	SHL2IMPLIB=i$(SHL2TARGET)	139	SHL2IMPLIB=i$(SHL2TARGET)
124		140
Lines 136-141 Link Here
136	$(SLB)$/dtobjfact.lib\	152	$(SLB)$/dtobjfact.lib\
137	$(SLB)$/mtaolecb.lib	153	$(SLB)$/mtaolecb.lib
138		154
		155	SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj
		156
		157	.IF "$(COM)"=="GCC"
		158	SHL3STDLIBS= \
		159	$(SALLIB) \
		160	$(CPPULIB) \
		161	$(CPPUHELPERLIB)\
		162	-luwinapi\
		163	-ladvapi32\
		164	-lole32\
		165	-luuid\
		166	-loleaut32\
		167	-lgdi32
		168	.ELSE
139	SHL3STDLIBS= \	169	SHL3STDLIBS= \
140	$(SALLIB) \	170	$(SALLIB) \
141	$(CPPULIB) \	171	$(CPPULIB) \
Lines 146-151 Link Here
146	comsupp.lib\	176	comsupp.lib\
147	oleaut32.lib\	177	oleaut32.lib\
148	gdi32.lib	178	gdi32.lib
		179	.ENDIF
149		180
150	SHL3IMPLIB=i$(SHL3TARGET)	181	SHL3IMPLIB=i$(SHL3TARGET)
151		182
Lines 163-168 Link Here
163	$(SLB)$/dtobjfact.lib\	194	$(SLB)$/dtobjfact.lib\
164	$(SLB)$/dtutils.lib	195	$(SLB)$/dtutils.lib
165		196
		197	.IF "$(COM)"=="GCC"
		198	SHL4STDLIBS= \
		199	$(SALLIB) \
		200	$(CPPULIB) \
		201	$(CPPUHELPERLIB) \
		202	-luwinapi\
		203	-ladvapi32\
		204	-lole32\
		205	-luuid\
		206	-loleaut32\
		207	-lgdi32
		208	.ELSE
166	SHL4STDLIBS= \	209	SHL4STDLIBS= \
167	$(SALLIB) \	210	$(SALLIB) \
168	$(CPPULIB) \	211	$(CPPULIB) \
Lines 173-178 Link Here
173	comsupp.lib\	216	comsupp.lib\
174	oleaut32.lib\	217	oleaut32.lib\
175	gdi32.lib	218	gdi32.lib
		219	.ENDIF
176		220
177	SHL4DEPN=	221	SHL4DEPN=
178	SHL4IMPLIB=i$(SHL4TARGET)	222	SHL4IMPLIB=i$(SHL4TARGET)

Lines 64-69 Link Here

(-)./dtrans/source/win32/mtaole/makefile.mk.orig (+1 lines)
64	PRJNAME=dtrans	64	PRJNAME=dtrans
65	TARGET=mtaolecb	65	TARGET=mtaolecb
66	LIBTARGET=NO	66	LIBTARGET=NO
		67	ENABLE_EXCEPTIONS=YES
67		68
68	# --- Settings ----------------------------------	69	# --- Settings ----------------------------------
69		70

Lines 66-71 Link Here

(-)./dtrans/source/win32/misc/makefile.mk.orig (+1 lines)
66	TARGET=dtutils	66	TARGET=dtutils
67	LIBTARGET=NO	67	LIBTARGET=NO
68	USE_BOUNDCHK=	68	USE_BOUNDCHK=
		69	ENABLE_EXCEPTIONS=YES
69		70
70	.IF "$(USE_BOUNDCHK)"=="TR"	71	.IF "$(USE_BOUNDCHK)"=="TR"
71	bndchk=tr	72	bndchk=tr




		 $(SLO)$/XNotifyingDataObject.obj

LIB1TARGET=$(SLB)$/$(TARGET).lib
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 ------------------------------------------------------


Lines 135-141 Link Here

(-)./ucb/source/ucp/webdav/makefile.mk.orig (+4 lines)
135	$(EXPATASCII3RDLIB)	135	$(EXPATASCII3RDLIB)
136		136
137	.IF "$(GUI)"=="WNT"	137	.IF "$(GUI)"=="WNT"
		138	.IF "$(COM)"=="GCC"
		139	SHL1STDLIBS+= -lwsock32
		140	.ELSE
138	SHL1STDLIBS+= wsock32.lib	141	SHL1STDLIBS+= wsock32.lib
		142	.ENDIF
139	.ENDIF # WNT	143	.ENDIF # WNT
140	.IF "$(OS)"=="SOLARIS"	144	.IF "$(OS)"=="SOLARIS"
141	SHL1STDLIBS+= -lnsl -lsocket	145	SHL1STDLIBS+= -lnsl -lsocket




                $(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


Lines 85-91 Link Here

(-)./xmlhelp/util/makefile.mk.orig (+4 lines)
85	SABLOT3RDLIB=-lsablot	85	SABLOT3RDLIB=-lsablot
86	.ENDIF # unx	86	.ENDIF # unx
87	.IF "$(GUI)"=="WNT"	87	.IF "$(GUI)"=="WNT"
		88	.IF "$(COM)"=="GCC"
		89	SABLOT3RDLIB=-lsablot_static
		90	.ELSE
88	SABLOT3RDLIB=sablot.lib	91	SABLOT3RDLIB=sablot.lib
		92	.ENDIF # gcc
89	.ENDIF # wnt	93	.ENDIF # wnt
90	.ENDIF # sablot3rdlib	94	.ENDIF # sablot3rdlib
91		95




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=	\

.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= \

		$(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

				$(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)

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)

.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)"==""






.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 = \

Lines 86-93 Link Here

(-)./tools/symbol/makefile.mk.orig (+5 lines)
86		86
87	APP1NOSAL=true	87	APP1NOSAL=true
88	APP1TARGET=$(TARGET)	88	APP1TARGET=$(TARGET)
		89	.IF "$(COM)"=="GCC"
		90	APP1STDLIBS=-ltl$(VERSION)$(DLLPOSTFIX)
		91	APP1DEPN=$(LB)$/libtl$(VERSION)$(DLLPOSTFIX).a
		92	.ELSE
89	APP1STDLIBS=$(LB)$/itools.lib	93	APP1STDLIBS=$(LB)$/itools.lib
90	APP1DEPN=$(LB)$/itools.lib	94	APP1DEPN=$(LB)$/itools.lib
		95	.ENDIF
91	APP1OBJS=$(OBJ)$/symbol.obj	96	APP1OBJS=$(OBJ)$/symbol.obj
92	#APP1DEF=$(MISC)$/$(TARGET).def	97	#APP1DEF=$(MISC)$/$(TARGET).def
93	APP1STACK=50000	98	APP1STACK=50000




SHL1IMPLIB=i$(TARGET)

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
SHL1STDLIBS=-lwsock32 $(SALLIB)
.ELSE
SHL1STDLIBS=wsock32.lib $(SALLIB)
.ENDIF
.ELSE
SHL1STDLIBS=$(SALLIB)
.ENDIF

.ELSE
.IF "$(GUI)" != "UNX"
.IF "$(GUI)" != "MAC"
.IF "$(COM)"!="GCC"
SHL1OBJS=    \
    $(SLO)$/object.obj
.ENDIF
.ENDIF
.ENDIF
.ENDIF

SHL1DEPN=
SHL1DEF=    $(MISC)$/$(SHL1TARGET).def

Lines 76-83 Link Here

(-)./codemaker/source/javamaker/makefile.mk.orig (+2 lines)
76	# --- Files --------------------------------------------------------	76	# --- Files --------------------------------------------------------
77		77
78	.IF "$(GUI)"=="WNT"	78	.IF "$(GUI)"=="WNT"
		79	.IF "$(COM)"!="GCC"
79	CFLAGSNOOPT+=-Ob0	80	CFLAGSNOOPT+=-Ob0
80	.ENDIF	81	.ENDIF
		82	.ENDIF
81		83
82	OBJFILES= $(OBJ)$/javamaker.obj \	84	OBJFILES= $(OBJ)$/javamaker.obj \
83	$(OBJ)$/javaoptions.obj \	85	$(OBJ)$/javaoptions.obj \

Lines 75-82 Link Here

(-)./codemaker/source/cppumaker/makefile.mk.orig (+2 lines)
75	# --- Files --------------------------------------------------------	75	# --- Files --------------------------------------------------------
76		76
77	.IF "$(GUI)"=="WNT"	77	.IF "$(GUI)"=="WNT"
		78	.IF "$(COM)"!="GCC"
78	CFLAGSNOOPT+=-Ob0	79	CFLAGSNOOPT+=-Ob0
79	.ENDIF	80	.ENDIF
		81	.ENDIF
80		82
81	OBJFILES= $(OBJ)$/cppumaker.obj \	83	OBJFILES= $(OBJ)$/cppumaker.obj \
82	$(OBJ)$/cppuoptions.obj \	84	$(OBJ)$/cppuoptions.obj \

Lines 108-115 Link Here

(-)./stoc/source/javavm/makefile.mk.orig (+4 lines)
108	$(SALHELPERLIB)	108	$(SALHELPERLIB)
109		109
110	.IF "$(GUI)"=="WNT"	110	.IF "$(GUI)"=="WNT"
		111	.IF "$(COM)"=="GCC"
		112	SHL1STDLIBS += -ladvapi32
		113	.ELSE
111	SHL1STDLIBS += advapi32.lib	114	SHL1STDLIBS += advapi32.lib
112	.ENDIF	115	.ENDIF
		116	.ENDIF
113		117
114	SHL1DEPN=	118	SHL1DEPN=
115	SHL1IMPLIB= i$(TARGET)	119	SHL1IMPLIB= i$(TARGET)

Lines 109-117 Link Here

(-)./bridges/source/cpp_uno/msvc_win32_intel/makefile.mk.orig (-2 / +2 lines)
109		109
110	DEF1NAME= $(SHL1TARGET)	110	DEF1NAME= $(SHL1TARGET)
111		111
		112	.ENDIF
		113
112	# --- Targets ------------------------------------------------------	114	# --- Targets ------------------------------------------------------
113		115
114	.INCLUDE : target.mk	116	.INCLUDE : target.mk
115		117
116	.ENDIF
117

Lines 70-75 Link Here

(-)./cppuhelper/source/makefile.mk.orig (+3 lines)
70		70
71	.IF "$(OS)" != "WNT"	71	.IF "$(OS)" != "WNT"
72	UNIXVERSIONNAMES=UDK	72	UNIXVERSIONNAMES=UDK
		73	.ELSE
73	.ENDIF # WNT	74	.ENDIF # WNT
74		75
75	# --- Settings -----------------------------------------------------	76	# --- Settings -----------------------------------------------------
Lines 197-202 Link Here
197	SHL1VERSIONMAP=gcc2_linux_intel.map	198	SHL1VERSIONMAP=gcc2_linux_intel.map
198	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"	199	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
199	SHL1VERSIONMAP=gcc3_linux_intel.map	200	SHL1VERSIONMAP=gcc3_linux_intel.map
		201	.ELIF "$(GUI)$(COM)"=="WNTGCC"
		202	SHL1VERSIONMAP=mingw.map
200	.ENDIF	203	.ENDIF
201		204
202	# --- Targets ------------------------------------------------------	205	# --- Targets ------------------------------------------------------

Lines 102-107 Link Here

(-)./store/util/makefile.mk.orig (+4 lines)
102		102
103	# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so	103	# On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
104	.IF "$(COMID)"=="gcc3"	104	.IF "$(COMID)"=="gcc3"
		105	.IF "$(GUI)"=="WNT"
		106	SHL1STDLIBS+= -lsupc++
		107	.ELSE
105	.IF "$(OS)"=="FREEBSD"	108	.IF "$(OS)"=="FREEBSD"
106	SHL1STDLIBS+= -lsupc++	109	SHL1STDLIBS+= -lsupc++
107	.ELSE	110	.ELSE
Lines 112-117 Link Here
112	.ENDIF	115	.ENDIF
113	.ENDIF	116	.ENDIF
114	.ENDIF	117	.ENDIF
		118	.ENDIF
115		119
116		120
117	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	121	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 135-141 Link Here

(-)./sal/util/makefile.mk.orig (-1 / +5 lines)
135	user32.lib\	135	user32.lib\
136	ole32.lib	136	ole32.lib
137	.ELSE	137	.ELSE
138	SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32	138	SHL1STDLIBS= $(DYNAMIC) -luwinapi -ladvapi32 -lwsock32 -lmpr -lole32
139	.ENDIF # GCC	139	.ENDIF # GCC
140	.ENDIF # WNT	140	.ENDIF # WNT
141		141
Lines 175-182 Link Here
175	SHL1OBJS= \	175	SHL1OBJS= \
176	$(OBJ)$/dllentry.obj	176	$(OBJ)$/dllentry.obj
177	.ELSE	177	.ELSE
		178	.IF "$(GUI)"!="WNT" \|\| "$(COM)"!="GCC"
178	SHL1OBJS= \	179	SHL1OBJS= \
179	$(SLO)$/dllentry.obj	180	$(SLO)$/dllentry.obj
		181	.ELSE
		182	SHL1OBJS=
		183	.ENDIF
180	.ENDIF # MAC	184	.ENDIF # MAC
181	.ENDIF # UNX	185	.ENDIF # UNX
182	.ENDIF # lincinc	186	.ENDIF # lincinc




#No default libraries
STDSHL=

.IF "$(COM)"=="GCC"
SHL1STDLIBS=\
		-lunicows \
		-lkernel32 \
		-luser32 \
		-ladvapi32 \
		-lversion \
		-lmsvcrt \
		-lmingw32 \
		-lgcc \
		-lversion
.ELSE
SHL1STDLIBS=\
		unicows.lib\
		kernel32.lib\

		advapi32.lib\
		version.lib\
		msvcrt.lib
.ENDIF

		
.ENDIF

Lines 81-87 Link Here

(-)./sal/systools/win32/guistdio/makefile.mk.orig (-1 / +1 lines)
81	APP1OBJS=$(OBJFILES)	81	APP1OBJS=$(OBJFILES)
82	APP1TARGET=$(TARGET)	82	APP1TARGET=$(TARGET)
83		83
84	STDLIB1=\	84	STDLIB1=
85		85
86		86
87	# --- Targets ------------------------------------------------------	87	# --- Targets ------------------------------------------------------

Lines 121-129 Link Here

(-)./so3/util/makefile.mk.orig (-1 / +8 lines)
121	.ENDIF	121	.ENDIF
122		122
123	.IF "$(GUI)"=="WNT"	123	.IF "$(GUI)"=="WNT"
		124	.IF "$(COM)"=="GCC"
		125	SHL1STDLIBS+= \
		126	-lole32 -luuid -ladvapi32 -lgdi32
		127	.ELSE
124	SHL1STDLIBS+= \	128	SHL1STDLIBS+= \
125	ole32.lib uuid.lib advapi32.lib gdi32.lib	129	ole32.lib uuid.lib advapi32.lib gdi32.lib
126	.ENDIF	130	.ENDIF
		131	.ENDIF
127		132
128	.IF "$(GUI)"=="WIN"	133	.IF "$(GUI)"=="WIN"
129	SHL1STDLIBS=$(VOSLIB) \	134	SHL1STDLIBS=$(VOSLIB) \
Lines 135-141 Link Here
135	SHL1STDLIBS+=$(SJLIB)	140	SHL1STDLIBS+=$(SJLIB)
136	.ENDIF	141	.ENDIF
137		142
138	.IF "$(GUI)"=="UNX"	143	.IF "$(GUI)"=="UNX"\|\|"$(GUI)$(COM)"=="WNTGCC"
139	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)	144	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)
140	.ELSE	145	.ELSE
141	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)	146	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)
Lines 143-152 Link Here
143		148
144	.IF "$(linkinc)" == ""	149	.IF "$(linkinc)" == ""
145	.IF "$(GUI)"=="WNT"	150	.IF "$(GUI)"=="WNT"
		151	.IF "$(COM)"!="GCC"
146	SHL1OBJS+= $(SLO)$/so2dll.obj \	152	SHL1OBJS+= $(SLO)$/so2dll.obj \
147	$(SHLOBJECTS)	153	$(SHLOBJECTS)
148		154
149	.ENDIF	155	.ENDIF
		156	.ENDIF
150	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	157	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
151		158
152	.ELSE #"$(linkinc)" == ""	159	.ELSE #"$(linkinc)" == ""





SHL1LIBS=   $(LIB1TARGET)
.IF "$(GUI)"!="UNX"
.IF "$(COM)"!="GCC"
SHL1OBJS=   $(SLO)$/salshl.obj
.ENDIF
.ENDIF

.IF "$(GUI)" != "MAC"
.IF "$(GUI)" != "UNX"


.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     \

               advapi32.lib     \
               apsp.lib         \
               imm32.lib
.ENDIF

.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
LINKFLAGSSHL += /ENTRY:LibMain@12

Lines 87-94 Link Here

(-)./idl/util/makefile.mk.orig (+6 lines)
87	APP1TARGET= svidl	87	APP1TARGET= svidl
88		88
89	.IF "$(GUI)" != "MAC"	89	.IF "$(GUI)" != "MAC"
		90	.IF "$(GUI)$(COM)" == "WNTGCC"
		91	APP1DEPN= $(L)$/libtl$(VERSION)$(DLLPOSTFIX).a
		92	.ELSE
90	APP1DEPN= $(L)$/itools.lib	93	APP1DEPN= $(L)$/itools.lib
91	.ENDIF	94	.ENDIF
		95	.ENDIF
92		96
93	APP1STDLIBS= \	97	APP1STDLIBS= \
94	$(TOOLSLIB) \	98	$(TOOLSLIB) \
Lines 96-101 Link Here
96		100
97	APP1LIBS= $(LIBPRE) $(LB)$/$(TARGET).lib	101	APP1LIBS= $(LIBPRE) $(LB)$/$(TARGET).lib
98	.IF "$(GUI)" != "UNX"	102	.IF "$(GUI)" != "UNX"
		103	.IF "$(COM)"!="GCC"
99	.IF "$(COM)"=="WTC"	104	.IF "$(COM)"=="WTC"
100	APP1OBJS= $(OBJ)$/svidl.obj	105	APP1OBJS= $(OBJ)$/svidl.obj
101	.ELSE	106	.ELSE
Lines 103-108 Link Here
103	$(OBJ)$/command.obj	108	$(OBJ)$/command.obj
104	.ENDIF	109	.ENDIF
105	.ENDIF	110	.ENDIF
		111	.ENDIF
106	.IF "$(COM)" == "WTC"	112	.IF "$(COM)" == "WTC"
107	APP1STACK=32768	113	APP1STACK=32768
108	.ENDIF	114	.ENDIF

Return to issue 24588

Lines 89-94 Link Here

(-)./embedserv/util/makefile.mk.orig (+11 lines)
89	$(SLO)$/esdll.obj \	89	$(SLO)$/esdll.obj \
90	$(SLO)$/intercept.obj	90	$(SLO)$/intercept.obj
91		91
		92	.IF "$(COM)"=="GCC"
		93	SHL1STDLIBS=\
		94	$(SALLIB) \
		95	$(CPPULIB) \
		96	$(CPPUHELPERLIB) \
		97	-lole32 \
		98	-lgdi32 \
		99	-luuid \
		100	-loleaut32
		101	.ELSE
92	SHL1STDLIBS=\	102	SHL1STDLIBS=\
93	$(SALLIB) \	103	$(SALLIB) \
94	$(CPPULIB) \	104	$(CPPULIB) \
Lines 97-102 Link Here
97	gdi32.lib \	107	gdi32.lib \
98	uuid.lib \	108	uuid.lib \
99	oleaut32.lib	109	oleaut32.lib
		110	.ENDIF
100		111
101	.IF "$(COMEX)"=="8"	112	.IF "$(COMEX)"=="8"
102	SHL1STDLIBS+= advapi32.lib \	113	SHL1STDLIBS+= advapi32.lib \

Lines 92-97 Link Here

(-)./curl/makefile.mk.orig (+14 lines)
92		92
93		93
94	.IF "$(GUI)"=="WNT"	94	.IF "$(GUI)"=="WNT"
		95	.IF "$(COM)"=="GCC"
		96	PATCH_FILE_NAME=unx1-curl-7.9.8.patch
		97	CONFIGURE_DIR=.$/
		98	#relative to CONFIGURE_DIR
		99	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'
		100	#CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict
		101
		102	BUILD_DIR=$(CONFIGURE_DIR)$/lib
		103	BUILD_ACTION=make
		104
		105	OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)
		106	OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
		107	.ELSE
95	PATCH_FILE_NAME=curl-7.9.8.patch	108	PATCH_FILE_NAME=curl-7.9.8.patch
96	# make use of stlport headerfiles	109	# make use of stlport headerfiles
97	EXT_USE_STLPORT=TRUE	110	EXT_USE_STLPORT=TRUE
Lines 102-107 Link Here
102	OUT2BIN=$(BUILD_DIR)$/libcurl.dll	115	OUT2BIN=$(BUILD_DIR)$/libcurl.dll
103	OUT2LIB=$(BUILD_DIR)$/libcurl.lib	116	OUT2LIB=$(BUILD_DIR)$/libcurl.lib
104		117
		118	.ENDIF
105	.ENDIF # "$(GUI)"=="WNT"	119	.ENDIF # "$(GUI)"=="WNT"
106		120
107		121

Lines 127-132 Link Here

(-)./icu/makefile.mk.orig (-1 / +23 lines)
127		127
128	.IF "$(GUI)"=="WNT"	128	.IF "$(GUI)"=="WNT"
129	CONFIGURE_DIR=source	129	CONFIGURE_DIR=source
		130	.IF "$(COM)"=="GCC"
		131	CONFIGURE_ACTION=sh -c 'CFLAGS="-O -mthreads" CXXFLAGS="-O -mthreads" LIBS="-mthreads" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
		132	CONFIGURE_FLAGS=
		133	BUILD_DIR=$(CONFIGURE_DIR)
		134	BUILD_ACTION=$(GNUMAKE)
		135	OUT2LIB= \
		136	$(BUILD_DIR)$/data$/out$/libicudata.a \
		137	$(BUILD_DIR)$/common$/libicuuc.a \
		138	$(BUILD_DIR)$/i18n$/libicui18n.a \
		139	$(BUILD_DIR)$/layout$/libicule.a
		140
		141	OUT2BIN= \
		142	$(BUILD_DIR)$/data$/out$/icudata.22$(DLLPOST) \
		143	$(BUILD_DIR)$/data$/out$/icudata$(DLLPOST) \
		144	$(BUILD_DIR)$/common$/icuuc.22$(DLLPOST) \
		145	$(BUILD_DIR)$/common$/icuuc$(DLLPOST) \
		146	$(BUILD_DIR)$/i18n$/icui18n.22$(DLLPOST) \
		147	$(BUILD_DIR)$/i18n$/icui18n$(DLLPOST) \
		148	$(BUILD_DIR)$/layout$/icule.22$(DLLPOST) \
		149	$(BUILD_DIR)$/layout$/icule$(DLLPOST)
		150	.ELSE
130	.IF "$(USE_SHELL)"=="4nt"	151	.IF "$(USE_SHELL)"=="4nt"
131	BUILD_ACTION_SEP=^	152	BUILD_ACTION_SEP=^
132	CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat	153	CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat
Lines 135-141 Link Here
135	CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh	156	CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh
136	.ENDIF # "$(USE_SHELL)"=="4nt"	157	.ENDIF # "$(USE_SHELL)"=="4nt"
137	BUILD_DIR=source	158	BUILD_DIR=source
138	.IF "$(COMEX)"=="8"	159	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
139	CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) wdevenv allinone$/allinone Release	160	CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) wdevenv allinone$/allinone Release
140	BUILD_ACTION=devenv allinone$/allinone.sln /build Release /project all /useenv	161	BUILD_ACTION=devenv allinone$/allinone.sln /build Release /project all /useenv
141	.ELSE	162	.ELSE
Lines 154-159 Link Here
154	$(BUILD_DIR)$/..$/bin$/icuuc22.dll \	175	$(BUILD_DIR)$/..$/bin$/icuuc22.dll \
155	$(BUILD_DIR)$/..$/bin$/icule22.dll	176	$(BUILD_DIR)$/..$/bin$/icule22.dll
156	.ENDIF	177	.ENDIF
		178	.ENDIF
157		179
158	# --- Targets ------------------------------------------------------	180	# --- Targets ------------------------------------------------------
159		181

Lines 80-105 Link Here

(-)./stlport/makefile.mk.orig (-12 / +28 lines)
80	TARFILE_NAME=STLport-4.0	80	TARFILE_NAME=STLport-4.0
81	PATCH_FILE_NAME=STLport-4.0.macosx.patch	81	PATCH_FILE_NAME=STLport-4.0.macosx.patch
82	.ELSE	82	.ELSE
83	TARFILE_NAME=STLport-4.0	83	.IF "$(GUI)"=="WNT"
84	PATCH_FILE_NAME=STLport-4.0.patch	84	.IF "$(CCNUMVER)"<="001300000000"
		85	TARFILE_NAME=STLport-4.0
		86	PATCH_FILE_NAME=STLport-4.0.patch
		87	.ELSE # "$(CCNUMVER)"<="001300000000"
		88	TARFILE_NAME=STLport-4.5-0119
		89	PATCH_FILE_NAME=STLport-4.5-0119.patch
		90	.ENDIF # "$(CCNUMVER)"<="001300000000"
		91	.ELSE
		92	TARFILE_NAME=STLport-4.0
		93	PATCH_FILE_NAME=STLport-4.0.patch
		94	.ENDIF
85	.ENDIF # "$(OS)"=="MACOSX"	95	.ENDIF # "$(OS)"=="MACOSX"
86	.ENDIF # "$(COMID)"=="gcc3"	96	.ENDIF # "$(COMID)"=="gcc3"
87		97
88	.IF "$(GUI)"=="WNT"
89	.IF "$(CCNUMVER)"<="001300000000"
90	TARFILE_NAME=STLport-4.0
91	PATCH_FILE_NAME=STLport-4.0.patch
92	.ELSE # "$(CCNUMVER)"<="001300000000"
93	TARFILE_NAME=STLport-4.5-0119
94	PATCH_FILE_NAME=STLport-4.5-0119.patch
95	.ENDIF # "$(CCNUMVER)"<="001300000000"
96	.ENDIF
97		98
98	.IF "$(USE_SHELL)"=="4nt"	99	.IF "$(USE_SHELL)"=="4nt"
99	TAR_EXCLUDES=/SC5/	100	TAR_EXCLUDES=/SC5/
100	.ENDIF # "$(USE_SHELL)"=="4nt"	101	.ENDIF # "$(USE_SHELL)"=="4nt"
101		102
102	ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak	103	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
103		104
104		105
105	CONFIGURE_ACTION=none	106	CONFIGURE_ACTION=none
Lines 123-128 Link Here
123	BUILD_FLAGS=-f gcc-3.0-freebsd.mak	124	BUILD_FLAGS=-f gcc-3.0-freebsd.mak
124	.ELIF "$(OS)"=="MACOSX"	125	.ELIF "$(OS)"=="MACOSX"
125	BUILD_FLAGS=-f gcc-3.0-macosx.mak	126	BUILD_FLAGS=-f gcc-3.0-macosx.mak
		127	.ELIF "$(GUI)"=="WNT"
		128	BUILD_FLAGS=-f gcc-3.0-mingw.mak
126	.ELSE	129	.ELSE
127	BUILD_FLAGS=-f gcc-3.0.mak	130	BUILD_FLAGS=-f gcc-3.0.mak
128	.ENDIF	131	.ENDIF
Lines 161-166 Link Here
161	stlport	164	stlport
162		165
163	.IF "$(GUI)"=="WNT"	166	.IF "$(GUI)"=="WNT"
		167	.IF "$(COM)"=="GCC"
		168
		169	OUT2LIB= \
		170	lib$/lib*.a
		171
		172	OUT2BIN= \
		173	lib$/*.dll
		174
		175	.ELSE
164		176
165	OUT2LIB= \	177	OUT2LIB= \
166	lib$/*.lib	178	lib$/*.lib
Lines 169-174 Link Here
169	lib$/*.dll \	181	lib$/*.dll \
170	lib$/*.pdb	182	lib$/*.pdb
171		183
		184	.ENDIF
172	.ELSE # "$(GUI)"=="WNT"	185	.ELSE # "$(GUI)"=="WNT"
173		186
174	OUT2LIB= \	187	OUT2LIB= \
Lines 195-200 Link Here
195	+$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch	208	+$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
196		209
197	.IF "$(GUI)"=="WNT"	210	.IF "$(GUI)"=="WNT"
		211	.IF "$(COM)"=="GCC"
		212	.ELSE
198	.IF "$(CCNUMVER)"<="001300000000"	213	.IF "$(CCNUMVER)"<="001300000000"
199		214
200	$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches	215	$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
Lines 226-228 Link Here
226	.ENDIF # "$(USE_NEW_SDK)"!=""	241	.ENDIF # "$(USE_NEW_SDK)"!=""
227	.ENDIF # COMVER<=001300000000	242	.ENDIF # COMVER<=001300000000
228	.ENDIF # "$(GUI)"=="WNT"	243	.ENDIF # "$(GUI)"=="WNT"
		244	.ENDIF

Lines 79-84 Link Here

(-)./fpicker/util/makefile.mk.orig (+31 lines)
79		79
80	SHL1TARGET=$(TARGET1)	80	SHL1TARGET=$(TARGET1)
81		81
		82	.IF "$(COM)"=="GCC"
		83	SHL1STDLIBS=$(CPPULIB)\
		84	$(CPPUHELPERLIB)\
		85	$(SALLIB)\
		86	$(VCLLIB)\
		87	$(TOOLSLIB)\
		88	-luwinapi \
		89	-ladvapi32 \
		90	-lshell32\
		91	-lole32\
		92	-lgdi32\
		93	-loleaut32\
		94	-lcomdlg32\
		95	-lkernel32\
		96	-loleaut32
		97	.ELSE
82	SHL1STDLIBS=$(CPPULIB)\	98	SHL1STDLIBS=$(CPPULIB)\
83	$(CPPUHELPERLIB)\	99	$(CPPUHELPERLIB)\
84	$(SALLIB)\	100	$(SALLIB)\
Lines 94-99 Link Here
94	kernel32.lib\	110	kernel32.lib\
95	comsupp.lib\	111	comsupp.lib\
96	oleaut32.lib	112	oleaut32.lib
		113	.ENDIF
97		114
98	SHL1DEPN=	115	SHL1DEPN=
99	SHL1IMPLIB=i$(SHL1TARGET)	116	SHL1IMPLIB=i$(SHL1TARGET)
Lines 113-118 Link Here
113		130
114	SHL2TARGET=$(TARGET2)	131	SHL2TARGET=$(TARGET2)
115		132
		133	.IF "$(COM)"=="GCC"
		134	SHL2STDLIBS=$(CPPULIB)\
		135	$(CPPUHELPERLIB)\
		136	$(SALLIB)\
		137	$(TOOLSLIB)\
		138	$(VCLLIB)\
		139	-luwinapi \
		140	-ladvapi32 \
		141	-lole32\
		142	-lgdi32\
		143	-lshell32\
		144	-loleaut32
		145	.ELSE
116	SHL2STDLIBS=$(CPPULIB)\	146	SHL2STDLIBS=$(CPPULIB)\
117	$(CPPUHELPERLIB)\	147	$(CPPUHELPERLIB)\
118	$(SALLIB)\	148	$(SALLIB)\
Lines 125-130 Link Here
125	shell32.lib\	155	shell32.lib\
126	comsupp.lib\	156	comsupp.lib\
127	oleaut32.lib	157	oleaut32.lib
		158	.ENDIF
128		159
129	SHL2DEPN=	160	SHL2DEPN=
130	SHL2IMPLIB=i$(SHL2TARGET)	161	SHL2IMPLIB=i$(SHL2TARGET)

Lines 97-107 Link Here

(-)./berkeleydb/makefile.mk.orig (-1 / +18 lines)
97	.ENDIF # "$(GUI)"=="UNX"	97	.ENDIF # "$(GUI)"=="UNX"
98		98
99	.IF "$(GUI)"=="WNT"	99	.IF "$(GUI)"=="WNT"
		100	.IF "$(COM)"=="GCC"
		101	CONFIGURE_DIR=out
		102	#relative to CONFIGURE_DIR
		103	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'
		104	#CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
		105
		106	BUILD_DIR=$(CONFIGURE_DIR)
		107	BUILD_ACTION=make
		108
		109	OUT2BIN=java$/classes$/db.jar \
		110	$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
		111
		112
		113	OUT2LIB= \
		114	$(BUILD_DIR)$/.libs$/libdb*.a
		115	.ELSE
100	# make use of stlport headerfiles	116	# make use of stlport headerfiles
101	EXT_USE_STLPORT=TRUE	117	EXT_USE_STLPORT=TRUE
102		118
103	BUILD_DIR=build_win32	119	BUILD_DIR=build_win32
104	.IF "$(COMEX)"=="8"	120	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
105	CONFIGURE_DIR=build_win32	121	CONFIGURE_DIR=build_win32
106	CONFIGURE_ACTION=wdevenv Berkeley_DB Release	122	CONFIGURE_ACTION=wdevenv Berkeley_DB Release
107	.IF "$(USE_SHELL)"!="4nt"	123	.IF "$(USE_SHELL)"!="4nt"
Lines 122-127 Link Here
122	$(BUILD_DIR)$/Release$/libdb_java32.lib \	138	$(BUILD_DIR)$/Release$/libdb_java32.lib \
123	$(BUILD_DIR)$/Release$/libdb32.lib	139	$(BUILD_DIR)$/Release$/libdb32.lib
124		140
		141	.ENDIF
125	.ENDIF # "$(GUI)"=="WNT"	142	.ENDIF # "$(GUI)"=="WNT"
126		143
127	OUT2INC= \	144	OUT2INC= \

Lines 72-79 Link Here

(-)./psprint/util/makefile.mk.orig (+22 lines)
72	# --- Allgemein ----------------------------------------------------------	72	# --- Allgemein ----------------------------------------------------------
73		73
74	.IF "$(OS)"=="WNT"	74	.IF "$(OS)"=="WNT"
		75	.IF "$(COM)"=="GCC"
		76
		77	LIB1TARGET= $(SLB)$/$(TARGET).lib
		78	LIB1FILES= $(SLB)$/fontsubset.lib
		79
		80	SHL1TARGET= psp$(UPD)$(DLLPOSTFIX)
		81	SHL1IMPLIB= ipsp
		82	SHL1LIBS=$(LIB1FILES)
		83
		84	SHL1VERSIONMAP=libpsp_mingw.map
		85
		86	SHL1STDLIBS=$(SALLIB)
		87
		88	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
		89
		90	# --- Def-File ---
		91
		92	DEF1NAME= $(SHL1TARGET)
		93	DEF1DES=PSPrint
		94
		95	.ELSE
75	LIB1TARGET= $(SLB)$/a$(TARGET).lib	96	LIB1TARGET= $(SLB)$/a$(TARGET).lib
76	LIB1FILES= $(SLB)$/fontsubset.lib	97	LIB1FILES= $(SLB)$/fontsubset.lib
		98	.ENDIF
77	.ELSE	99	.ELSE
78		100
79	LIB1TARGET= $(SLB)$/$(TARGET).lib	101	LIB1TARGET= $(SLB)$/$(TARGET).lib

Lines 115-120 Link Here

(-)./shell/source/win32/shlxthandler/makefile.mk.orig (+18 lines)
115		115
116	SHL1TARGET=$(TARGET)	116	SHL1TARGET=$(TARGET)
117		117
		118	.IF "$(COM)"=="GCC"
		119	SHL1STDLIBS=-luwinapi\
		120	-loleaut32\
		121	-ladvapi32\
		122	-lole32\
		123	-luuid\
		124	-lshell32\
		125	-lcomctl32\
		126	-lgdi32\
		127	$(STATIC) -lzlib_static\
		128	-lexpat_xmlparse_static\
		129	-lexpat_xmltok_static $(DYNAMIC)
		130	.ELSE
118	SHL1STDLIBS=uwinapi.lib\	131	SHL1STDLIBS=uwinapi.lib\
119	oleaut32.lib\	132	oleaut32.lib\
120	advapi32.lib\	133	advapi32.lib\
Lines 127-132 Link Here
127	SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\	140	SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
128	$(SOLARLIBDIR)$/expat_xmlparse.lib\	141	$(SOLARLIBDIR)$/expat_xmlparse.lib\
129	$(SOLARLIBDIR)$/expat_xmltok.lib	142	$(SOLARLIBDIR)$/expat_xmltok.lib
		143	.ENDIF
130		144
131	SHL1DEPN=	145	SHL1DEPN=
132		146
Lines 141-147 Link Here
141	OBJFILES=$(OBJ)$/regsvrex.obj	155	OBJFILES=$(OBJ)$/regsvrex.obj
142	APP1TARGET=$(TARGET1)	156	APP1TARGET=$(TARGET1)
143	APP1OBJS=$(OBJFILES)	157	APP1OBJS=$(OBJFILES)
		158	.IF "$(COM)"=="GCC"
		159	APP1STDLIBS=-lkernel32
		160	.ELSE
144	APP1STDLIBS=kernel32.lib	161	APP1STDLIBS=kernel32.lib
		162	.ENDIF
145	APP1DEF=$(MISC)$/$(APP1TARGET).def	163	APP1DEF=$(MISC)$/$(APP1TARGET).def
146		164
147	# --- Targets ------------------------------------------------------	165	# --- Targets ------------------------------------------------------

Lines 81-92 Link Here

(-)./shell/source/win32/makefile.mk.orig (-1 / +10 lines)
81		81
82	SHL1TARGET=$(TARGET)	82	SHL1TARGET=$(TARGET)
83		83
		84	.IF "$(COM)"=="GCC"
84	SHL1STDLIBS=$(CPPULIB)\	85	SHL1STDLIBS=$(CPPULIB)\
85	$(CPPUHELPERLIB)\	86	$(CPPUHELPERLIB)\
86	$(SALLIB)\	87	$(SALLIB)\
87	uwinapi.lib \	88	-luwinapi \
		89	-ladvapi32 \
		90	-lshell32
		91	.ELSE
		92	SHL1STDLIBS=$(CPPULIB)\
		93	$(CPPUHELPERLIB)\
		94	$(SALLIB)\
		95	uwinapi.lib \
88	advapi32.lib \	96	advapi32.lib \
89	shell32.lib	97	shell32.lib
		98	.ENDIF
90		99
91	SHL1DEPN=	100	SHL1DEPN=
92	SHL1IMPLIB=i$(SHL1TARGET)	101	SHL1IMPLIB=i$(SHL1TARGET)

Lines 84-89 Link Here

(-)./sysui/source/win32/QuickStart/so/makefile.mk.orig (+11 lines)
84	APP1OBJS=$(OBJFILES)	84	APP1OBJS=$(OBJFILES)
85	APP1NOSAL=TRUE	85	APP1NOSAL=TRUE
86	APP1TARGET=$(TARGET)	86	APP1TARGET=$(TARGET)
		87	.IF "$(COM)"=="GCC"
		88	APP1STDLIBS=-lshell32\
		89	-lole32\
		90	-lgdi32\
		91	-loleaut32\
		92	-lcomdlg32\
		93	-lkernel32\
		94	-luuid\
		95	-loleaut32
		96	.ELSE
87	APP1STDLIBS=shell32.lib\	97	APP1STDLIBS=shell32.lib\
88	ole32.lib\	98	ole32.lib\
89	gdi32.lib\	99	gdi32.lib\
Lines 94-99 Link Here
94	oleaut32.lib	104	oleaut32.lib
95		105
96	APP1NOSVRES=$(RES)$/$(TARGET).res	106	APP1NOSVRES=$(RES)$/$(TARGET).res
		107	.ENDIF
97		108
98	# --- Targets ------------------------------------------------------	109	# --- Targets ------------------------------------------------------
99		110

Lines 83-88 Link Here

(-)./sysui/source/win32/QuickStart/makefile.mk.orig (+11 lines)
83	APP1OBJS=$(OBJFILES)	83	APP1OBJS=$(OBJFILES)
84	APP1NOSAL=TRUE	84	APP1NOSAL=TRUE
85	APP1TARGET=$(TARGET)	85	APP1TARGET=$(TARGET)
		86	.IF "$(COM)"=="GCC"
		87	APP1STDLIBS=-lshell32\
		88	-lole32\
		89	-lgdi32\
		90	-loleaut32\
		91	-lcomdlg32\
		92	-lkernel32\
		93	-luuid\
		94	-loleaut32
		95	.ELSE
86	APP1STDLIBS=shell32.lib\	96	APP1STDLIBS=shell32.lib\
87	ole32.lib\	97	ole32.lib\
88	gdi32.lib\	98	gdi32.lib\
Lines 91-96 Link Here
91	kernel32.lib\	101	kernel32.lib\
92	comsupp.lib\	102	comsupp.lib\
93	oleaut32.lib	103	oleaut32.lib
		104	.ENDIF
94		105
95	APP1NOSVRES=$(RES)$/$(TARGET).res	106	APP1NOSVRES=$(RES)$/$(TARGET).res
96		107

Lines 93-99 Link Here

(-)./dtrans/source/win32/dtobj/makefile.mk.orig (-1 / +12 lines)
93	$(SLO)$/XNotifyingDataObject.obj	93	$(SLO)$/XNotifyingDataObject.obj
94		94
95	LIB1TARGET=$(SLB)$/$(TARGET).lib	95	LIB1TARGET=$(SLB)$/$(TARGET).lib
96	LIB1OBJFILES=$(SLOFILES)	96	LIB1OBJFILES=$(SLO)$/DtObjFactory.obj\
		97	$(SLO)$/APNDataObject.obj\
		98	$(SLO)$/DOTransferable.obj\
		99	$(SLO)$/DTransHelper.obj\
		100	$(SLO)$/XTDataObject.obj\
		101	$(SLO)$/TxtCnvtHlp.obj\
		102	$(SLO)$/DataFmtTransl.obj\
		103	$(SLO)$/FmtFilter.obj\
		104	$(SLO)$/FetcList.obj\
		105	$(SLO)$/Fetc.obj
		106
		107
97		108
98	# --- Targets ------------------------------------------------------	109	# --- Targets ------------------------------------------------------
99		110

Lines 141-152 Link Here

(-)./framework/util/makefile.mk.orig (+8 lines)
141	$(SALLIB)	141	$(SALLIB)
142		142
143	.IF "$(GUI)"=="WNT"	143	.IF "$(GUI)"=="WNT"
		144	.IF "$(COM)"=="GCC"
		145	SHL1STDLIBS+=\
		146	-luwinapi \
		147	-lunicows \
		148	-ladvapi32 \
		149	-lkernel32
		150	.ELSE
144	SHL1STDLIBS+=\	151	SHL1STDLIBS+=\
145	uwinapi.lib \	152	uwinapi.lib \
146	unicows.lib \	153	unicows.lib \
147	advapi32.lib \	154	advapi32.lib \
148	kernel32.lib	155	kernel32.lib
149	.ENDIF	156	.ENDIF
		157	.ENDIF
150		158
151	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	159	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
152		160

Lines 86-103 Link Here

(-)./svtools/util/makefile.mk.orig (+32 lines)
86	LIB2OBJFILES= $(OBJ)$/filearch.obj	86	LIB2OBJFILES= $(OBJ)$/filearch.obj
87		87
88	.IF "$(GUI)"!="UNX"	88	.IF "$(GUI)"!="UNX"
		89	.IF "$(COM)"!="GCC"
89	LIB3TARGET= $(LB)$/svtool.lib	90	LIB3TARGET= $(LB)$/svtool.lib
90	LIB3FILES= $(LB)$/_svt.lib	91	LIB3FILES= $(LB)$/_svt.lib
91	LIB3OBJFILES=\	92	LIB3OBJFILES=\
92	$(OBJ)$/rtfkey2.obj	93	$(OBJ)$/rtfkey2.obj
93	.ENDIF	94	.ENDIF
		95	.ENDIF
94		96
95	.IF "$(GUI)"!="UNX"	97	.IF "$(GUI)"!="UNX"
		98	.IF "$(COM)"!="GCC"
96	LIB4TARGET= $(LB)$/isvl.lib	99	LIB4TARGET= $(LB)$/isvl.lib
97	LIB4FILES= $(LB)$/_isvl.lib	100	LIB4FILES= $(LB)$/_isvl.lib
98	LIB4OBJFILES=\	101	LIB4OBJFILES=\
99	$(OBJ)$/htmlkey2.obj	102	$(OBJ)$/htmlkey2.obj
100	.ENDIF	103	.ENDIF
		104	.ENDIF
101		105
102	LIB7TARGET= $(SLB)$/svt.lib	106	LIB7TARGET= $(SLB)$/svt.lib
103	LIB7FILES= \	107	LIB7FILES= \
Lines 204-213 Link Here
204	.ENDIF	208	.ENDIF
205		209
206	.IF "$(GUI)"=="WNT"	210	.IF "$(GUI)"=="WNT"
		211	.IF "$(COM)"=="GCC"
		212	SHL1STDLIBS+= \
		213	-luwinapi \
		214	-ladvapi32 \
		215	-lgdi32
		216	.ELSE
207	SHL1STDLIBS+= \	217	SHL1STDLIBS+= \
208	uwinapi.lib \	218	uwinapi.lib \
209	$(LIBPRE) advapi32.lib \	219	$(LIBPRE) advapi32.lib \
210	$(LIBPRE) gdi32.lib	220	$(LIBPRE) gdi32.lib
		221	.ENDIF
211	.ENDIF # WNT	222	.ENDIF # WNT
212		223
213	SHL1LIBS= \	224	SHL1LIBS= \
Lines 241-250 Link Here
241	$(SALLIB)	252	$(SALLIB)
242		253
243	.IF "$(GUI)"=="WNT"	254	.IF "$(GUI)"=="WNT"
		255	.IF "$(COM)"=="GCC"
		256	SHL2STDLIBS+= \
		257	-luwinapi \
		258	-ladvapi32 \
		259	-lgdi32
		260	.ELSE
244	SHL2STDLIBS+= \	261	SHL2STDLIBS+= \
245	uwinapi.lib \	262	uwinapi.lib \
246	$(LIBPRE) advapi32.lib \	263	$(LIBPRE) advapi32.lib \
247	$(LIBPRE) gdi32.lib	264	$(LIBPRE) gdi32.lib
		265	.ENDIF
248	.ENDIF # WNT	266	.ENDIF # WNT
249		267
250	SHL2LIBS= $(SLB)$/svl.lib	268	SHL2LIBS= $(SLB)$/svl.lib
Lines 265-271 Link Here
265	$(OBJ)$/bmpcore.obj	283	$(OBJ)$/bmpcore.obj
266		284
267	.IF "$(GUI)"!="UNX"	285	.IF "$(GUI)"!="UNX"
		286	.IF "$(COM)"=="GCC"
		287	APP1STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
		288	APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
		289	.ELSE
268	APP1STDLIBS+= svtool.lib	290	APP1STDLIBS+= svtool.lib
		291	.ENDIF
269	.ELSE	292	.ELSE
270	APP1STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)	293	APP1STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
271	APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)	294	APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
Lines 286-292 Link Here
286	APP2OBJS = $(OBJ)$/g2g.obj	309	APP2OBJS = $(OBJ)$/g2g.obj
287		310
288	.IF "$(GUI)"!="UNX"	311	.IF "$(GUI)"!="UNX"
		312	.IF "$(COM)"=="GCC"
		313	APP2STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
		314	APP2STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
		315	.ELSE
289	APP2STDLIBS+= svtool.lib	316	APP2STDLIBS+= svtool.lib
		317	.ENDIF
290	.ELSE	318	.ELSE
291	APP2STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)	319	APP2STDLIBS+= -lsvt$(UPD)$(DLLSUFFIX)
292	APP2STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)	320	APP2STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
Lines 302-310 Link Here
302	.IF "$(GUI)"=="UNX"	330	.IF "$(GUI)"=="UNX"
303	SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST)	331	SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
304	.ELSE	332	.ELSE
		333	.IF "$(GUI)$(COM)"=="WNTGCC"
		334	SVTTARGETS= $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
		335	.ELSE
305	SVTTARGETS= $(LB)$/isvl.lib \	336	SVTTARGETS= $(LB)$/isvl.lib \
306	$(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)	337	$(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST)
307	.ENDIF	338	.ENDIF
		339	.ENDIF
308		340
309	# just a quick fix - has to be cleaned up some day...	341	# just a quick fix - has to be cleaned up some day...
310	.IF "$(L10N-framework)"==""	342	.IF "$(L10N-framework)"==""

Lines 207-218 Link Here

(-)./tools/util/makefile.mk.orig (+8 lines)
207		207
208		208
209	.IF "$(GUI)"=="WNT"	209	.IF "$(GUI)"=="WNT"
		210	.IF "$(COM)"=="GCC"
		211	SHL1STDLIBS+= -lshell32 \
		212	-lmpr \
		213	-lole32 \
		214	-luuid \
		215	-ladvapi32
		216	.ELSE
210	SHL1STDLIBS+= shell32.lib \	217	SHL1STDLIBS+= shell32.lib \
211	mpr.lib \	218	mpr.lib \
212	ole32.lib \	219	ole32.lib \
213	uuid.lib \	220	uuid.lib \
214	advapi32.lib	221	advapi32.lib
215	.ENDIF	222	.ENDIF
		223	.ENDIF
216		224
217	DEF1NAME =$(SHL1TARGET)	225	DEF1NAME =$(SHL1TARGET)
218	DEF1DEPN = \	226	DEF1DEPN = \

Lines 105-111 Link Here

(-)./vos/util/makefile.mk.orig (+6 lines)
105	SHL1IMPLIB=i$(TARGET)	105	SHL1IMPLIB=i$(TARGET)
106		106
107	.IF "$(GUI)"=="WNT"	107	.IF "$(GUI)"=="WNT"
		108	.IF "$(COM)"=="GCC"
		109	SHL1STDLIBS=-lwsock32 $(SALLIB)
		110	.ELSE
108	SHL1STDLIBS=wsock32.lib $(SALLIB)	111	SHL1STDLIBS=wsock32.lib $(SALLIB)
		112	.ENDIF
109	.ELSE	113	.ELSE
110	SHL1STDLIBS=$(SALLIB)	114	SHL1STDLIBS=$(SALLIB)
111	.ENDIF	115	.ENDIF
Lines 123-133 Link Here
123	.ELSE	127	.ELSE
124	.IF "$(GUI)" != "UNX"	128	.IF "$(GUI)" != "UNX"
125	.IF "$(GUI)" != "MAC"	129	.IF "$(GUI)" != "MAC"
		130	.IF "$(COM)"!="GCC"
126	SHL1OBJS= \	131	SHL1OBJS= \
127	$(SLO)$/object.obj	132	$(SLO)$/object.obj
128	.ENDIF	133	.ENDIF
129	.ENDIF	134	.ENDIF
130	.ENDIF	135	.ENDIF
		136	.ENDIF
131		137
132	SHL1DEPN=	138	SHL1DEPN=
133	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	139	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 143-148 Link Here

(-)./sal/systools/win32/uwinapi/makefile.mk.orig (+13 lines)
143	#No default libraries	143	#No default libraries
144	STDSHL=	144	STDSHL=
145		145
		146	.IF "$(COM)"=="GCC"
		147	SHL1STDLIBS=\
		148	-lunicows \
		149	-lkernel32 \
		150	-luser32 \
		151	-ladvapi32 \
		152	-lversion \
		153	-lmsvcrt \
		154	-lmingw32 \
		155	-lgcc \
		156	-lversion
		157	.ELSE
146	SHL1STDLIBS=\	158	SHL1STDLIBS=\
147	unicows.lib\	159	unicows.lib\
148	kernel32.lib\	160	kernel32.lib\
Lines 150-155 Link Here
150	advapi32.lib\	162	advapi32.lib\
151	version.lib\	163	version.lib\
152	msvcrt.lib	164	msvcrt.lib
		165	.ENDIF
153		166
154		167
155	.ENDIF	168	.ENDIF

Lines 225-232 Link Here

(-)./vcl/util/makefile.mk.orig (+13 lines)
225		225
226	SHL1LIBS= $(LIB1TARGET)	226	SHL1LIBS= $(LIB1TARGET)
227	.IF "$(GUI)"!="UNX"	227	.IF "$(GUI)"!="UNX"
		228	.IF "$(COM)"!="GCC"
228	SHL1OBJS= $(SLO)$/salshl.obj	229	SHL1OBJS= $(SLO)$/salshl.obj
229	.ENDIF	230	.ENDIF
		231	.ENDIF
230		232
231	.IF "$(GUI)" != "MAC"	233	.IF "$(GUI)" != "MAC"
232	.IF "$(GUI)" != "UNX"	234	.IF "$(GUI)" != "UNX"
Lines 246-251 Link Here
246		248
247	.IF "$(GUI)" == "WNT"	249	.IF "$(GUI)" == "WNT"
248		250
		251	.IF "$(COM)"=="GCC"
		252	SHL1STDLIBS += -luwinapi \
		253	-lgdi32 \
		254	-lwinspool \
		255	-lole32 \
		256	-lshell32 \
		257	-ladvapi32 \
		258	-lpsp$(VERSION)$(DLLPOSTFIX) \
		259	-limm32
		260	.ELSE
249	SHL1STDLIBS += uwinapi.lib \	261	SHL1STDLIBS += uwinapi.lib \
250	gdi32.lib \	262	gdi32.lib \
251	winspool.lib \	263	winspool.lib \
Lines 254-259 Link Here
254	advapi32.lib \	266	advapi32.lib \
255	apsp.lib \	267	apsp.lib \
256	imm32.lib	268	imm32.lib
		269	.ENDIF
257		270
258	.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"	271	.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
259	LINKFLAGSSHL += /ENTRY:LibMain@12	272	LINKFLAGSSHL += /ENTRY:LibMain@12