Attachment #14295 for issue #24588

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

Lines 107-121 Link Here

(-)oo_1.1.1_src/autodoc/source/exes/adc_uni/makefile.mk.orig (-3 / +9 lines)
107	APP1OBJS= $(OBJ)$/main.obj	107	APP1OBJS= $(OBJ)$/main.obj
108		108
109	.IF "$(GUI)"=="WNT"	109	.IF "$(GUI)"=="WNT"
110	APP1STDLIBS= $(LIBSTLPORT) cosv.lib udm.lib	110	.IF "$(COM)"!="GCC"
		111	APP1STDLIBS=
		112	.ELSE
		113	APP1STDLIBS= $(LIBSTLPORT)
		114	.ENDIF
111	.ELSE	115	.ELSE
112	.IF "$(OS)"=="MACOSX"	116	.IF "$(OS)"=="MACOSX"
113	APP1STDLIBS= $(LIBSTLPORT) -ludm -lcosv	117	APP1STDLIBS= $(LIBSTLPORT)
114	.ELSE	118	.ELSE
115	APP1STDLIBS= -lcosv -ludm	119	APP1STDLIBS=
116	.ENDIF	120	.ENDIF
117	.ENDIF	121	.ENDIF
118		122
		123	APP1STDLIBS+= $(COSVLIB) $(UDMLIB)
		124
119	APP1LIBS=$(LB)$/atdoc.lib	125	APP1LIBS=$(LB)$/atdoc.lib
120		126
121	DEPOBJFILES += $(APP1OBJS)	127	DEPOBJFILES += $(APP1OBJS)





.IF "$(GUI)"=="WNT"
SHL1STDLIBS+=$(LIBCIMT) \
		$(APP3RDLIB) \
		$(ADVAPI32LIB)	\
		$(GDI32LIB)
.ENDIF

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

APP1STDLIBS= -lapp -lsample
.ELSE
APP1STDLIBS= \
		$(APP3RDLIB) \
		$(SAMPLE3RDLIB)
.ENDIF
	
APP1STDLIBS+= \


.IF "$(GUI)" != "UNX"
#		win16 braucht ein appobj
.IF "$(COM)"!="GCC"
APP3OBJS=		$(OBJ)$/testapp.obj
.ENDIF
.ENDIF

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


Lines 107-115 Link Here

(-)oo_1.1.1_src/basic/util/makefile.mk.orig (+2 lines)
107	.ENDIF	107	.ENDIF
108		108
109	.IF "$(GUI)" != "UNX"	109	.IF "$(GUI)" != "UNX"
		110	.IF "$(COM)" != "GCC"
110	SHL1OBJS= \	111	SHL1OBJS= \
111	$(SLO)$/sb.obj	112	$(SLO)$/sb.obj
112	.ENDIF	113	.ENDIF
		114	.ENDIF
113		115
114	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	116	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
115	SHL1LIBS= $(SLB)$/sb.lib	117	SHL1LIBS= $(SLB)$/sb.lib

Lines 97-103 Link Here

(-)oo_1.1.1_src/basic/source/app/makefile.mk.orig (-1 / +2 lines)
97	$(OBJ)$/comm_bas.obj	97	$(OBJ)$/comm_bas.obj
98		98
99	EXCEPTIONSFILES = \	99	EXCEPTIONSFILES = \
100	$(OBJ)$/app.obj	100	$(OBJ)$/app.obj \
		101	$(OBJ)$/process.obj
101		102
102		103
103	SRCFILES = \	104	SRCFILES = \




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

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_DIR=out
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=/bin/sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LDFLAGS="-no-unde""fined $(SOLARLIB)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" ..$/dist$/configure --host=x86-pc-mingw32 --enable-cxx --enable-java --enable-dynamic --enable-shared'
#CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared

BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=make

OUT2BIN=java$/classes$/db.jar \
	$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)


OUT2LIB= \
	$(BUILD_DIR)$/.libs$/libdb*.a
.ELSE
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE


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

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

OUT2INC= \

Lines 76-82 Link Here

(-)oo_1.1.1_src/bridges/source/cpp_uno/mingw_intel/makefile.mk.orig (-1 / +3 lines)
76		76
77	# --- Files --------------------------------------------------------	77	# --- Files --------------------------------------------------------
78		78
79	.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3"	79	.IF "$(COM)" == "GCC"
80		80
81	.IF "$(cppu_no_leak)" == ""	81	.IF "$(cppu_no_leak)" == ""
82	CFLAGS += -DLEAK_STATIC_DATA	82	CFLAGS += -DLEAK_STATIC_DATA
Lines 104-109 Link Here
104	$(CPPULIB) \	104	$(CPPULIB) \
105	$(SALLIB)	105	$(SALLIB)
106		106
		107	DEF1NAME= $(SHL1TARGET)
		108
107	.ENDIF	109	.ENDIF
108		110
109	# --- Targets ------------------------------------------------------	111	# --- Targets ------------------------------------------------------

Lines 109-117 Link Here

(-)oo_1.1.1_src/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 76-83 Link Here

(-)oo_1.1.1_src/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

(-)oo_1.1.1_src/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 68-73 Link Here

(-)oo_1.1.1_src/connectivity/source/drivers/ado/makefile.mk.orig (-4 / +8 lines)
68		68
69	# ENABLE_EXCEPTIONS=TRUE	69	# ENABLE_EXCEPTIONS=TRUE
70		70
		71
71	# --- Settings ----------------------------------	72	# --- Settings ----------------------------------
72	.IF "$(DBGUTIL_OJ)"!=""	73	.IF "$(DBGUTIL_OJ)"!=""
73	ENVCFLAGS+=/FR$(SLO)$/	74	ENVCFLAGS+=/FR$(SLO)$/
Lines 112-117 Link Here
112	$(SLO)$/adoimp.obj	113	$(SLO)$/adoimp.obj
113		114
114	EXCEPTIONSFILES= \	115	EXCEPTIONSFILES= \
		116	$(SLO)$/ADatabaseMetaDataImpl.obj \
		117	$(SLO)$/Aolevariant.obj \
115	$(SLO)$/ADatabaseMetaData.obj \	118	$(SLO)$/ADatabaseMetaData.obj \
116	$(SLO)$/AColumn.obj \	119	$(SLO)$/AColumn.obj \
117	$(SLO)$/AColumns.obj \	120	$(SLO)$/AColumns.obj \
Lines 137-143 Link Here
137	$(SLO)$/APreparedStatement.obj \	140	$(SLO)$/APreparedStatement.obj \
138	$(SLO)$/AResultSetMetaData.obj \	141	$(SLO)$/AResultSetMetaData.obj \
139	$(SLO)$/ADriver.obj \	142	$(SLO)$/ADriver.obj \
140	$(SLO)$/Aservices.obj	143	$(SLO)$/Aservices.obj \
		144	$(SLO)$/adoimp.obj
141		145
142	# --- Library -----------------------------------	146	# --- Library -----------------------------------
143		147
Lines 149-157 Link Here
149	$(VOSLIB) \	153	$(VOSLIB) \
150	$(OSLLIB) \	154	$(OSLLIB) \
151	$(SALLIB) \	155	$(SALLIB) \
152	ole32.lib \	156	$(OLE32LIB) \
153	oleaut32.lib \	157	$(OLEAUT32LIB) \
154	uuid.lib \	158	$(UUIDLIB) \
155	$(DBTOOLSLIB) \	159	$(DBTOOLSLIB) \
156	$(COMPHELPERLIB)	160	$(COMPHELPERLIB)
157		161

Lines 70-75 Link Here

(-)oo_1.1.1_src/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 79-90 Link Here

(-)oo_1.1.1_src/crashrep/source/win32/makefile.mk.orig (-7 / +9 lines)
79		79
80	STDLIB1=\	80	STDLIB1=\
81	$(SALLIB)\	81	$(SALLIB)\
82	gdi32.lib\	82	$(GDI32LIB)\
83	comctl32.lib\	83	$(COMCTL32LIB)\
84	comdlg32.lib\	84	$(COMDLG32LIB)\
85	advapi32.lib\	85	$(ADVAPI32LIB)\
86	wsock32.lib\	86	$(WSOCK32LIB)\
87	dbghelp.lib	87	$(DBGHELPLIB)\
		88	$(SHELL32LIB)\
		89	$(PSAPILIB)
88		90
89	APP1NOSVRES=$(RES)$/$(TARGET).res	91	APP1NOSVRES=$(RES)$/$(TARGET).res
90		92
Lines 96-100 Link Here
96	# using lngconvex.exe	98	# using lngconvex.exe
97		99
98	$(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt	100	$(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
99	+lngconvex.exe -lng ..\all\crashrep.lng -rc $(TARGET).rc -c ctrylnglist.txt -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt	101	+$(WRAPCMD) lngconvex.exe -lng ../all/crashrep.lng -rc $(TARGET).rc -c ctrylnglist.txt -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
100		102






.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
PATCH_FILE_NAME=unx1-curl-7.9.8.patch
CONFIGURE_DIR=.$/
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=/bin/sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LIBS="-lws2_32 -lwinmm -lmingwthrd" .$/configure --host=x86-pc-mingw32 --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict'
#CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict 

BUILD_DIR=$(CONFIGURE_DIR)$/lib
BUILD_ACTION=make

OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a
.ELSE
PATCH_FILE_NAME=curl-7.9.8.patch
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE

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

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






APP2DEPN= $(APP2RES) verinfo.rc
APP2NOSAL=TRUE
APP2TARGET=sowrapper
APP2STDLIBS+=$(SHELL32LIB)
APP2OBJS=       $(OBJ)$/sowrapper.obj \
                $(OBJ)$/wrapperw.obj \
                $(OBJ)$/wrappera.obj

APP3DEPN= $(APP3RES) verinfo.rc
APP3NOSAL=TRUE
APP3TARGET=solocal
APP3STDLIBS+=$(SHELL32LIB)
APP3OBJS= \
                $(OBJ)$/sowrapper.obj \
                $(OBJ)$/lwrapw.obj \

APP4DEPN= $(APP4RES) verinfo.rc
APP4NOSAL=TRUE
APP4TARGET=soremote
APP4STDLIBS+=$(SHELL32LIB)
APP4OBJS= \
                $(OBJ)$/sowrapper.obj \
                $(OBJ)$/rwrapw.obj \





.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= \
		$(UWINAPILIB)
.ENDIF



		$(SALLIB)	\
		$(CPPULIB) 	\
		$(CPPUHELPERLIB)\
		$(UWINAPILIB)\
		$(ADVAPILIB)\
		$(OLE32LIB)\
		$(GDI32LIB)

SHL2IMPLIB=i$(SHL2TARGET) 


		 $(SLB)$/dtobjfact.lib\
		 $(SLB)$/mtaolecb.lib

SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj

.IF "$(COM)"=="GCC"
SHL3STDLIBS= \
		-luuid
.ELSE
SHL3STDLIBS= \
		comsupp.lib
.ENDIF

SHL3STDLIBS+= \
		$(SALLIB)	\
		$(CPPULIB) 	\
		$(CPPUHELPERLIB)\
		$(UWINAPILIB)\
		$(ADVAPI32LIB)\
		$(OLE32LIB)\
		$(OLEAUT32LIB)\
		$(GDI32LIB)

		
SHL3IMPLIB=i$(SHL3TARGET) 

SHL3DEF=		$(MISC)$/$(SHL3TARGET).def

			$(SLB)$/dtobjfact.lib\
			$(SLB)$/dtutils.lib

.IF "$(COM)"=="GCC"
SHL4STDLIBS= \
		-luuid
.ELSE
SHL4STDLIBS= \
		comsupp.lib
.ENDIF

SHL4STDLIBS+= \
		$(SALLIB)	\
		$(CPPULIB) 	\
		$(CPPUHELPERLIB) \
		$(UWINAPILIB)\
		$(ADVAPI32LIB)\
		$(OLE32LIB)\
		$(OLEAUT32LIB)\
		$(GDI32LIB)
		gdi32.lib

SHL4DEPN=
SHL4IMPLIB=i$(SHL4TARGET) 

Lines 64-69 Link Here

(-)oo_1.1.1_src/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

(-)oo_1.1.1_src/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 82-88 Link Here

(-)oo_1.1.1_src/dtrans/source/win32/clipb/makefile.mk.orig (+4 lines)
82		82
83	.INCLUDE : ..$/..$/cppumaker.mk	83	.INCLUDE : ..$/..$/cppumaker.mk
84		84
		85	.IF "$(COM)" == "GCC"
		86	CFLAGS+=-DUNICODE -D_UNICODE
		87	.ELSE
85	CFLAGS+=-GR -DUNICODE -D_UNICODE	88	CFLAGS+=-GR -DUNICODE -D_UNICODE
		89	.ENDIF
86		90
87	SLOFILES=$(SLO)$/WinClipboard.obj \	91	SLOFILES=$(SLO)$/WinClipboard.obj \
88	$(SLO)$/WinClipbImpl.obj \	92	$(SLO)$/WinClipbImpl.obj \

Lines 74-80 Link Here

(-)oo_1.1.1_src/dtrans/source/cnttype/wbench/makefile.mk.orig (+4 lines)
74		74
75	.INCLUDE : ..$/..$/cppumaker.mk	75	.INCLUDE : ..$/..$/cppumaker.mk
76		76
		77	.IF "$(COM)"=="GCC"
		78	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		79	.ELSE
77	CFLAGS+=-GX	80	CFLAGS+=-GX
		81	.ENDIF
78		82
79	# --- Files --------------------------------------------------------	83	# --- Files --------------------------------------------------------
80		84

Lines 93-100 Link Here

(-)oo_1.1.1_src/embedserv/util/makefile.mk.orig (-4 / +4 lines)
93	$(SALLIB) \	93	$(SALLIB) \
94	$(CPPULIB) \	94	$(CPPULIB) \
95	$(CPPUHELPERLIB) \	95	$(CPPUHELPERLIB) \
96	ole32.lib \	96	$(OLE32LIB) \
97	gdi32.lib \	97	$(GDI32LIB) \
98	uuid.lib \	98	$(UUIDLIB) \
99	oleaut32.lib	99	$(OLEAUT32LIB)
100		100

Lines 86-94 Link Here

(-)oo_1.1.1_src/extensions/source/plugin/util/makefile.mk.orig (-3 / +3 lines)
86	.IF "$(GUI)" == "WNT"	86	.IF "$(GUI)" == "WNT"
87	SHL1LINKLIB = $(SLB)$/plwin.lib	87	SHL1LINKLIB = $(SLB)$/plwin.lib
88	SHL1OWNLIBS = \	88	SHL1OWNLIBS = \
89	version.lib \	89	$(VERSIONLIB) \
90	ole32.lib \	90	$(OLE32LIB) \
91	advapi32.lib	91	$(ADVAPI32LIB)
92	.ENDIF # WNT	92	.ENDIF # WNT
93		93
94	.IF "$(GUI)" == "OS2"	94	.IF "$(GUI)" == "OS2"






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






SHL1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
SHL1STDLIBS=\
        $(SALLIB) 	\
	$(VOSLIB)	\
	$(CPPULIB)	\
	$(CPPUHELPERLIB)	\
	$(LIBCIMT) 	\
	-lole32 	\
	-luuid 	\
	-ladvapi32	\
	-loleaut32
.ELSE
SHL1STDLIBS=\
        $(SALLIB) 	\
	$(VOSLIB)	\

	uuid.lib 	\
	advapi32.lib	\
	oleaut32.lib
.ENDIF


DEF1EXPORTFILE=$(SHL1TARGET).dxp

.ENDIF
.ENDIF

#----------------------------------------------------------------


Lines 145-151 Link Here

(-)oo_1.1.1_src/extensions/source/installation/office/protchk/makefile.mk.orig (-1 / +1 lines)
145	$(SALLIB)	145	$(SALLIB)
146		146
147	.IF "$(GUI)"=="WNT"	147	.IF "$(GUI)"=="WNT"
148	SHL1STDLIBS+= advapi32.lib shell32.lib	148	SHL1STDLIBS+= $(ADVAPI32LIB) $(SHELL32LIB)
149	SHL1OBJS= $(SLO)$/regtools.obj	149	SHL1OBJS= $(SLO)$/regtools.obj
150	.ENDIF	150	.ENDIF
151		151




.INCLUDE : settings.mk

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

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



MTL_SWITCHES=/tlb $(MISC)\so_activex.tlb /h $(MISC)\so_activex.h /iid $(MISC)\so_activex_i.c /dlldata $(MISC)\so_activex_dll.c /proxy $(MISC)\so_activex_p.c /Oicf

.IF "$(COM)"=="GCC"
MTL_SWITCHES+=/no_cpp

activex_component : $(SOURCE) 
	guw.pl idlcpp -D__MINGW32__ -I$(CYGINC) $(SOURCE) > $(MISC)$/so_activex.idl
	$(MTL) $(MTL_SWITCHES) $(MISC)\so_activex.idl
.ELSE
activex_component : $(SOURCE) 
	$(MTL) $(MTL_SWITCHES) $(SOURCE) 
.ENDIF

.ENDIF
.ENDIF

.INCLUDE : target.mk


Lines 71-76 Link Here

(-)oo_1.1.1_src/extensions/source/activex/main/makefile.mk.orig (+2 lines)
71	.INCLUDE : settings.mk	71	.INCLUDE : settings.mk
72		72
73	.IF "$(GUI)" == "WNT"	73	.IF "$(GUI)" == "WNT"
		74	.IF "$(COM)" != "GCC"
74		75
75	VERSIONOBJ=	76	VERSIONOBJ=
76	LIBTARGET=NO	77	LIBTARGET=NO
Lines 126-131 Link Here
126	SHL1RES=$(RES)$/$(TARGET).res	127	SHL1RES=$(RES)$/$(TARGET).res
127		128
128	.ENDIF	129	.ENDIF
		130	.ENDIF
129		131
130	# --- Targets ----------------------------------	132	# --- Targets ----------------------------------
131		133




PRJ=..
PRJNAME=3rdparty
TARGET=unicows

.INCLUDE : settings.mk

.IF "$(GUI)$(COM)"=="WNTGCC"
ALL: $(LB)$/libunicows.a

$(LB)$/libunicows.a:
	echo EXPORTS > $(MISC)$/unicows.def
	guw.pl reimp -s $(PSDK_HOME)$/lib$/unicows.lib | sed -e 's:^_::' >> $(MISC)$/unicows.def
	dlltool --dllname unicows.dll --input-def=$(MISC)$/unicows.def --kill-at --output-lib=$(LB)$/libunicows.a

.ENDIF

.INCLUDE :  target.mk




PRJ=..
PRJNAME=3rdparty
TARGET=dbghelp

.INCLUDE : settings.mk

.IF "$(GUI)$(COM)"=="WNTGCC"
ALL: $(LB)$/libdbghelp.a

$(LB)$/libdbghelp.a:
	echo EXPORTS > $(MISC)$/dbghelp.def
	guw.pl reimp -s $(PSDK_HOME)$/lib$/dbghelp.lib | sed -e 's:^_::' >> $(MISC)$/dbghelp.def
	dlltool --dllname dbghelp.dll --input-def=$(MISC)$/dbghelp.def --kill-at --output-lib=$(LB)$/libdbghelp.a
.ENDIF

.INCLUDE :  target.mk




			$(SALLIB)\
			$(VCLLIB)\
			$(TOOLSLIB)\
			$(UWINAPILIB) \
			$(ADVAPI32LIB) \
			$(SHELL32LIB)\
			$(OLE32LIB)\
			$(GDI32LIB)\
			$(OLEAUT32LIB)\
			$(COMDLG32LIB)

.IF "$(COM)"!="GCC"
SHL2STDLIBS+=comsupp.lib
.ENDIF

SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)

			$(SALLIB)\
			$(TOOLSLIB)\
			$(VCLLIB)\
			$(UWINAPILIB) \
			$(ADVAPI32LIB) \
			$(OLE32LIB)\
			$(GDI32LIB)\
			$(SHELL32LIB)\
			$(OLEAUT32LIB)

.IF "$(COM)"!="GCC"
SHL2STDLIBS+=comsupp.lib
.ENDIF

SHL2DEPN=
SHL2IMPLIB=i$(SHL2TARGET)

Lines 71-77 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/misc/makefile.mk.orig (+4 lines)
71		71
72	.INCLUDE : ..$/..$/cppumaker.mk	72	.INCLUDE : ..$/..$/cppumaker.mk
73		73
		74	.IF "$(COM)"=="GCC"
		75	CFLAGS+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
		76	.ELSE
74	CFLAGS+=-GX -DUNICODE -D_UNICODE	77	CFLAGS+=-GX -DUNICODE -D_UNICODE
		78	.ENDIF
75		79
76	# --- Files -------------------------------------	80	# --- Files -------------------------------------
77		81

Lines 75-81 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/folderpicker/workbench/makefile.mk.orig (+4 lines)
75		75
76	.INCLUDE : ..$/..$/..$/cppumaker.mk	76	.INCLUDE : ..$/..$/..$/cppumaker.mk
77		77
		78	.IF "$(COM)"=="GCC"
		79	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		80	.ELSE
78	CFLAGS+=-GR -GX	81	CFLAGS+=-GR -GX
		82	.ENDIF
79		83
80	# --- Files --------------------------------------------------------	84	# --- Files --------------------------------------------------------
81		85

Lines 73-79 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/filepicker/workbench/makefile.mk.orig (+4 lines)
73		73
74	.INCLUDE : ..$/..$/..$/cppumaker.mk	74	.INCLUDE : ..$/..$/..$/cppumaker.mk
75		75
		76	.IF "$(COM)"=="GCC"
		77	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		78	.ELSE
76	CFLAGS+=-GR -GX	79	CFLAGS+=-GR -GX
		80	.ENDIF
77		81
78	# --- Files --------------------------------------------------------	82	# --- Files --------------------------------------------------------
79		83

Lines 77-83 Link Here

(-)oo_1.1.1_src/fpicker/source/win32/filepicker/makefile.mk.orig (+4 lines)
77		77
78	.INCLUDE : ..$/..$/cppumaker.mk	78	.INCLUDE : ..$/..$/cppumaker.mk
79		79
		80	.IF "$(COM)"=="GCC"
		81	CFLAGS+=-fexceptions -fno-enforce-eh-specs -D_WIN32_WINNT=0x0500 -D_UNICODE -DUNICODE
		82	.ELSE
80	CFLAGS+=-GX -GR -D_WIN32_WINNT=0x0500 -D_UNICODE -DUNICODE	83	CFLAGS+=-GX -GR -D_WIN32_WINNT=0x0500 -D_UNICODE -DUNICODE
		84	.ENDIF
81		85
82	# --- Resources ----------------------------------------------------	86	# --- Resources ----------------------------------------------------
83		87

Lines 142-151 Link Here

(-)oo_1.1.1_src/framework/util/makefile.mk.orig (-4 / +3 lines)
142		142
143	.IF "$(GUI)"=="WNT"	143	.IF "$(GUI)"=="WNT"
144	SHL1STDLIBS+=\	144	SHL1STDLIBS+=\
145	uwinapi.lib \	145	$(UWIN32LIB) \
146	unicows.lib \	146	$(UNICOWSLIB) \
147	advapi32.lib \	147	$(ADVAPI32LIB)
148	kernel32.lib
149	.ENDIF	148	.ENDIF
150		149
151	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	150	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 89-96 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/itiff/makefile.mk.orig (+2 lines)
89	SHL1LIBS= $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib	89	SHL1LIBS= $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
90		90
91	.IF "$(GUI)" != "UNX"	91	.IF "$(GUI)" != "UNX"
		92	.IF "$(COM)" != "GCC"
92	SHL1OBJS= $(SLO)$/itiff.obj	93	SHL1OBJS= $(SLO)$/itiff.obj
93	.ENDIF	94	.ENDIF
		95	.ENDIF
94		96
95	SHL1VERSIONMAP=exports.map	97	SHL1VERSIONMAP=exports.map
96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	98	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/itga/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/itga.lib	87	SHL1LIBS= $(SLB)$/itga.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/itga.obj	91	SHL1OBJS= $(SLO)$/itga.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/iras/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/iras.lib	87	SHL1LIBS= $(SLB)$/iras.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/iras.obj	91	SHL1OBJS= $(SLO)$/iras.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ipsd/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ipsd.lib	87	SHL1LIBS= $(SLB)$/ipsd.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ipsd.obj	91	SHL1OBJS= $(SLO)$/ipsd.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ipict/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ipict.lib	87	SHL1LIBS= $(SLB)$/ipict.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ipict.obj	91	SHL1OBJS= $(SLO)$/ipict.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ipcx/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ipcx.lib	87	SHL1LIBS= $(SLB)$/ipcx.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ipcx.obj	91	SHL1OBJS= $(SLO)$/ipcx.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ipcd/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib	87	SHL1LIBS= $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ipcd.obj	91	SHL1OBJS= $(SLO)$/ipcd.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ipbm/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ipbm.lib	87	SHL1LIBS= $(SLB)$/ipbm.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ipbm.obj	91	SHL1OBJS= $(SLO)$/ipbm.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 88-95 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ios2met/makefile.mk.orig (+2 lines)
88	SHL1LIBS= $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib	88	SHL1LIBS= $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
89		89
90	.IF "$(GUI)" != "UNX"	90	.IF "$(GUI)" != "UNX"
		91	.IF "$(COM)" != "GCC"
91	SHL1OBJS= $(SLO)$/ios2met.obj	92	SHL1OBJS= $(SLO)$/ios2met.obj
92	.ENDIF	93	.ENDIF
		94	.ENDIF
93		95
94	SHL1VERSIONMAP=exports.map	96	SHL1VERSIONMAP=exports.map
95	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	97	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/ieps/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/ieps.lib	87	SHL1LIBS= $(SLB)$/ieps.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/ieps.obj	91	SHL1OBJS= $(SLO)$/ieps.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 95-102 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/idxf/makefile.mk.orig (+2 lines)
95	SHL1LIBS= $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib	95	SHL1LIBS= $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
96		96
97	.IF "$(GUI)" != "UNX"	97	.IF "$(GUI)" != "UNX"
		98	.IF "$(COM)" != "GCC"
98	SHL1OBJS= $(SLO)$/idxf.obj	99	SHL1OBJS= $(SLO)$/idxf.obj
99	.ENDIF	100	.ENDIF
		101	.ENDIF
100		102
101	SHL1VERSIONMAP=exports.map	103	SHL1VERSIONMAP=exports.map
102	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 88-95 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/expm/makefile.mk.orig (+2 lines)
88	SHL1LIBS= $(SLB)$/expm.lib	88	SHL1LIBS= $(SLB)$/expm.lib
89		89
90	.IF "$(GUI)" != "UNX"	90	.IF "$(GUI)" != "UNX"
		91	.IF "$(COM)" != "GCC"
91	SHL1OBJS= $(SLO)$/expm.obj	92	SHL1OBJS= $(SLO)$/expm.obj
92	.ENDIF	93	.ENDIF
		94	.ENDIF
93		95
94	SHL1VERSIONMAP=exports.map	96	SHL1VERSIONMAP=exports.map
95	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	97	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/etiff/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/etiff.lib	87	SHL1LIBS= $(SLB)$/etiff.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/etiff.obj	91	SHL1OBJS= $(SLO)$/etiff.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 87-94 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/eras/makefile.mk.orig (+2 lines)
87	SHL1LIBS= $(SLB)$/eras.lib	87	SHL1LIBS= $(SLB)$/eras.lib
88		88
89	.IF "$(GUI)" != "UNX"	89	.IF "$(GUI)" != "UNX"
		90	.IF "$(COM)" != "GCC"
90	SHL1OBJS= $(SLO)$/eras.obj	91	SHL1OBJS= $(SLO)$/eras.obj
91	.ENDIF	92	.ENDIF
		93	.ENDIF
92		94
93	SHL1VERSIONMAP=exports.map	95	SHL1VERSIONMAP=exports.map
94	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	96	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 97-104 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/eps/makefile.mk.orig (+2 lines)
97	SHL1LIBS= $(SLB)$/eps.lib	97	SHL1LIBS= $(SLB)$/eps.lib
98		98
99	.IF "$(GUI)" != "UNX"	99	.IF "$(GUI)" != "UNX"
		100	.IF "$(COM)" != "GCC"
100	SHL1OBJS= $(SLO)$/eps.obj	101	SHL1OBJS= $(SLO)$/eps.obj
101	.ENDIF	102	.ENDIF
		103	.ENDIF
102		104
103	SHL1VERSIONMAP=exports.map	105	SHL1VERSIONMAP=exports.map
104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	106	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 96-103 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/eppm/makefile.mk.orig (+2 lines)
96	SHL1LIBS= $(SLB)$/eppm.lib	96	SHL1LIBS= $(SLB)$/eppm.lib
97		97
98	.IF "$(GUI)" != "UNX"	98	.IF "$(GUI)" != "UNX"
		99	.IF "$(COM)" != "GCC"
99	SHL1OBJS= $(SLO)$/eppm.obj	100	SHL1OBJS= $(SLO)$/eppm.obj
100	.ENDIF	101	.ENDIF
		102	.ENDIF
101		103
102	SHL1VERSIONMAP=exports.map	104	SHL1VERSIONMAP=exports.map
103	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	105	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 95-102 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/epng/makefile.mk.orig (+2 lines)
95	SHL1LIBS= $(SLB)$/epng.lib	95	SHL1LIBS= $(SLB)$/epng.lib
96		96
97	.IF "$(GUI)" != "UNX"	97	.IF "$(GUI)" != "UNX"
		98	.IF "$(COM)" != "GCC"
98	SHL1OBJS= $(SLO)$/epng.obj	99	SHL1OBJS= $(SLO)$/epng.obj
99	.ENDIF	100	.ENDIF
		101	.ENDIF
100		102
101	SHL1VERSIONMAP=exports.map	103	SHL1VERSIONMAP=exports.map
102	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 97-104 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/epict/makefile.mk.orig (+2 lines)
97	SHL1LIBS= $(SLB)$/epict.lib	97	SHL1LIBS= $(SLB)$/epict.lib
98		98
99	.IF "$(GUI)" != "UNX"	99	.IF "$(GUI)" != "UNX"
		100	.IF "$(COM)" != "GCC"
100	SHL1OBJS= $(SLO)$/epict.obj	101	SHL1OBJS= $(SLO)$/epict.obj
101	.ENDIF	102	.ENDIF
		103	.ENDIF
102		104
103	SHL1VERSIONMAP=exports.map	105	SHL1VERSIONMAP=exports.map
104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	106	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 97-104 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/epgm/makefile.mk.orig (+2 lines)
97	SHL1LIBS= $(SLB)$/epgm.lib	97	SHL1LIBS= $(SLB)$/epgm.lib
98		98
99	.IF "$(GUI)" != "UNX"	99	.IF "$(GUI)" != "UNX"
		100	.IF "$(COM)" != "GCC"
100	SHL1OBJS= $(SLO)$/epgm.obj	101	SHL1OBJS= $(SLO)$/epgm.obj
101	.ENDIF	102	.ENDIF
		103	.ENDIF
102		104
103	SHL1VERSIONMAP=exports.map	105	SHL1VERSIONMAP=exports.map
104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	106	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 96-103 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/epbm/makefile.mk.orig (+2 lines)
96	SHL1LIBS= $(SLB)$/epbm.lib	96	SHL1LIBS= $(SLB)$/epbm.lib
97		97
98	.IF "$(GUI)" != "UNX"	98	.IF "$(GUI)" != "UNX"
		99	.IF "$(COM)" != "GCC"
99	SHL1OBJS= $(SLO)$/epbm.obj	100	SHL1OBJS= $(SLO)$/epbm.obj
100	.ENDIF	101	.ENDIF
		102	.ENDIF
101		103
102	SHL1VERSIONMAP=exports.map	104	SHL1VERSIONMAP=exports.map
103	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	105	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 95-102 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/eos2met/makefile.mk.orig (+2 lines)
95	SHL1DEPN= $(LB)$/eos2met.lib	95	SHL1DEPN= $(LB)$/eos2met.lib
96	SHL1LIBS= $(SLB)$/eos2met.lib	96	SHL1LIBS= $(SLB)$/eos2met.lib
97	.IF "$(GUI)" != "UNX"	97	.IF "$(GUI)" != "UNX"
		98	.IF "$(COM)" != "GCC"
98	SHL1OBJS= $(SLO)$/eos2met.obj	99	SHL1OBJS= $(SLO)$/eos2met.obj
99	.ENDIF	100	.ENDIF
		101	.ENDIF
100		102
101	SHL1VERSIONMAP=exports.map	103	SHL1VERSIONMAP=exports.map
102	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	104	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 98-105 Link Here

(-)oo_1.1.1_src/goodies/source/filter.vcl/egif/makefile.mk.orig (+2 lines)
98	SHL1LIBS= $(SLB)$/egif.lib	98	SHL1LIBS= $(SLB)$/egif.lib
99		99
100	.IF "$(GUI)" != "UNX"	100	.IF "$(GUI)" != "UNX"
		101	.IF "$(COM)" != "GCC"
101	SHL1OBJS= $(SLO)$/egif.obj	102	SHL1OBJS= $(SLO)$/egif.obj
102	.ENDIF	103	.ENDIF
		104	.ENDIF
103		105
104	SHL1VERSIONMAP=exports.map	106	SHL1VERSIONMAP=exports.map
105	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	107	SHL1DEF= $(MISC)$/$(SHL1TARGET).def

Lines 83-89 Link Here

(-)oo_1.1.1_src/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

(-)oo_1.1.1_src/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)





.IF "$(GUI)"=="WNT"
CONFIGURE_DIR=source
.IF "$(COM)"=="GCC"
CONFIGURE_ACTION=sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS="-O -mthreads" CXXFLAGS="-O -mthreads" LIBS="-mthreads" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
CONFIGURE_FLAGS=
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
OUT2LIB= \
	$(BUILD_DIR)$/data$/out$/libicudata.a \
	$(BUILD_DIR)$/common$/libicuuc.a \
	$(BUILD_DIR)$/i18n$/libicui18n.a \
	$(BUILD_DIR)$/layout$/libicule.a

OUT2BIN= \
	$(BUILD_DIR)$/data$/out$/icudata.22$(DLLPOST) \
	$(BUILD_DIR)$/data$/out$/icudata$(DLLPOST) \
	$(BUILD_DIR)$/common$/icuuc.22$(DLLPOST) \
	$(BUILD_DIR)$/common$/icuuc$(DLLPOST) \
	$(BUILD_DIR)$/i18n$/icui18n.22$(DLLPOST) \
	$(BUILD_DIR)$/i18n$/icui18n$(DLLPOST) \
	$(BUILD_DIR)$/layout$/icule.22$(DLLPOST) \
	$(BUILD_DIR)$/layout$/icule$(DLLPOST)
.ELSE
.IF "$(USE_SHELL)"=="4nt"
BUILD_ACTION_SEP=^
CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat

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

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


Lines 87-94 Link Here

(-)oo_1.1.1_src/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

Lines 102-109 Link Here

(-)oo_1.1.1_src/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 87-93 Link Here

(-)oo_1.1.1_src/jvmaccess/util/makefile.mk.orig (-1 / +3 lines)
87	SHL1LIBS = $(SLB)$/$(TARGET).lib	87	SHL1LIBS = $(SLB)$/$(TARGET).lib
88	SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)	88	SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
89	.IF "$(OS)" == "WNT"	89	.IF "$(OS)" == "WNT"
90	SHL1STDLIBS += advapi32.lib	90	SHL1STDLIBS += $(ADVAPI32LIB)
91	.ENDIF # WNT	91	.ENDIF # WNT
92		92
93	.IF "$(COMNAME)" == "msci"	93	.IF "$(COMNAME)" == "msci"
Lines 98-103 Link Here
98	SHL1VERSIONMAP = gcc3_linux_intel.map	98	SHL1VERSIONMAP = gcc3_linux_intel.map
99	.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"	99	.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"
100	SHL1VERSIONMAP = gcc3_linux_intel.map	100	SHL1VERSIONMAP = gcc3_linux_intel.map
		101	.ELIF "$(GUI)$(COM)" == "WNTGCC"
		102	SHL1VERSIONMAP = gcc3_linux_intel.map
101	.ENDIF	103	.ENDIF
102		104
103	DEF1NAME = $(SHL1TARGET)	105	DEF1NAME = $(SHL1TARGET)




ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE


.IF "$(ULINGULIB)"==""
.IF "$(GUI)"=="UNX"
ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
.ENDIF # unx
.IF "$(GUI)"=="WNT"
ULINGULIB=$(LIBPRE) ulingu.lib
.ENDIF # wnt
.ENDIF



#----- Settings ---------------------------------------------------------

.INCLUDE : settings.mk




ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE

.IF "$(MYSPELLLIB)"==""
.IF "$(GUI)"=="UNX"
MYSPELLLIB=-lmyspell
.ENDIF # unx
.IF "$(GUI)"=="WNT"
MYSPELLLIB=libmyspell.lib
.ENDIF # wnt
.ENDIF

.IF "$(ULINGULIB)"==""
.IF "$(GUI)"=="UNX"
ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
.ENDIF # unx
.IF "$(GUI)"=="WNT"
ULINGULIB=$(LIBPRE) ulingu.lib
.ENDIF # wnt
.ENDIF




#----- Settings ---------------------------------------------------------

.INCLUDE : settings.mk

Lines 87-93 Link Here

(-)oo_1.1.1_src/lingucomponent/source/lingutil/makefile.mk.orig (-1 / +3 lines)
87	SHL1LIBS= $(SLB)$/$(TARGET).lib	87	SHL1LIBS= $(SLB)$/$(TARGET).lib
88	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	88	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
89	DEF1NAME= $(SHL1TARGET)	89	DEF1NAME= $(SHL1TARGET)
90		90	.IF "$(GUI)$(COM)"=="WNTGCC"
		91	DEFLIB1NAME= $(SLB)$/$(TARGET)
		92	.ENDIF
91		93
92	# --- Targets ------------------------------------------------------	94	# --- Targets ------------------------------------------------------
93		95




ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE

.IF "$(GUI)"=="UNX"
HNJLIB=-lhnj
.ELSE
HNJLIB=libhnj.lib
.ENDIF

.IF "$(ULINGULIB)"==""
.IF "$(GUI)"=="UNX"
ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
.ENDIF # unx
.IF "$(GUI)"=="WNT"
ULINGULIB=$(LIBPRE) ulingu.lib
.ENDIF # wnt
.ENDIF



#----- Settings ---------------------------------------------------------

.INCLUDE : settings.mk

Lines 78-83 Link Here

(-)oo_1.1.1_src/moz/zipped/makefile.mk.orig (+10 lines)
78		78
79	.ELSE "$(OS)" == "MACOSX"	79	.ELSE "$(OS)" == "MACOSX"
80		80
		81	.IF "$(GUI)$(COM)"=="WNTGCC"
		82
		83
		84	dummy:
		85	@echo "Nothing to build for Mingw"
		86
		87	.ELSE "$(GUI)$(COM)"=="WNTGCC"
		88
81	all: \	89	all: \
82	$(MISC)$/unpacked_$(TARGET)_inc \	90	$(MISC)$/unpacked_$(TARGET)_inc \
83	$(MISC)$/unpacked_$(TARGET)_lib \	91	$(MISC)$/unpacked_$(TARGET)_lib \
Lines 107-112 Link Here
107	$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip	115	$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip
108	+$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip	116	+$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
109		117
		118	.ENDIF "$(GUI)$(COM)"=="WNTGCC"
		119
110	.ENDIF # "$(OS)" == "MACOSX"	120	.ENDIF # "$(OS)" == "MACOSX"
111		121
112	.INCLUDE : target.mk	122	.INCLUDE : target.mk

Lines 316-321 Link Here

(-)oo_1.1.1_src/odk/util/odk_rules.pmk.orig (+4 lines)
316	+-rm -f $@ >& $(NULLDEV)	316	+-rm -f $@ >& $(NULLDEV)
317	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@	317	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
318		318
		319	$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
		320	+-rm -f $@ >& $(NULLDEV)
		321	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
		322
319	$(DIR_CREATE_FLAG) :	323	$(DIR_CREATE_FLAG) :
320	.IF "$(USE_SHELL)" != "4nt"	324	.IF "$(USE_SHELL)" != "4nt"
321	+$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) \| xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@	325	+$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) \| xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@

Lines 20-26 Link Here

(-)oo_1.1.1_src/odk/source/bean/native/win32/makefile.mk.orig (+4 lines)
20	SHL1TARGET=$(TARGET)	20	SHL1TARGET=$(TARGET)
21	SHL1LIBS= $(SLB)$/$(TARGET).lib	21	SHL1LIBS= $(SLB)$/$(TARGET).lib
22	#SHL1IMPLIB= i$(TARGET)	22	#SHL1IMPLIB= i$(TARGET)
		23	.IF "$(COM)"=="GCC"
		24	SHL1STDLIBS=-ljawt $(SALLIB)
		25	.ELSE
23	SHL1STDLIBS=jawt.lib $(SALLIB)	26	SHL1STDLIBS=jawt.lib $(SALLIB)
		27	.ENDIF
24		28
25	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	29	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
26		30




	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
LIBLIST = \
	$(DESTDIRLIB)$/libstore.a 	\
	$(DESTDIRLIB)$/libreg.a 	\
	$(DESTDIRLIB)$/libsal.a 	\
	$(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a 	\
	$(DESTDIRLIB)$/libcppu.a 	\
	$(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a 	\
	$(DESTDIRLIB)$/librmcxt.a	\
	$(DESTDIRLIB)$/libstlport_gcc.a
.ELSE
LIBLIST = \
	$(DESTDIRLIB)$/istore.lib 	\
	$(DESTDIRLIB)$/ireg.lib 	\

	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
.ENDIF
.ENDIF
.ENDIF

SETTINGSLIST= \
	$(DESTDIRSETTINGS)$/settings.mk \

Lines 155-161 Link Here

(-)oo_1.1.1_src/offmgr/util/makefile.mk.orig (-1 / +1 lines)
155	.ENDIF	155	.ENDIF
156		156
157	.IF "$(GUI)"=="WNT"	157	.IF "$(GUI)"=="WNT"
158	SHL2STDLIBS += $(LIBPRE) advapi32.lib	158	SHL2STDLIBS += $(ADVAPI32LIB)
159	.ENDIF # WNT	159	.ENDIF # WNT
160		160
161	SHL2DEF= $(MISC)$/$(SHL2TARGET).def	161	SHL2DEF= $(MISC)$/$(SHL2TARGET).def




.ELSE		# "$(GUIBASE)"=="aqua"

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

LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1FILES=	$(SLB)$/fontsubset.lib

SHL1TARGET= psp$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB= ipsp
SHL1LIBS=$(LIB1FILES)

SHL1STDLIBS=$(SALLIB)

SHL1VERSIONMAP=libpsp_mingw.map

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

# --- Def-File ---

DEF1NAME=	$(SHL1TARGET)
DEF1DES=PSPrint

.ELSE
LIB1TARGET= $(SLB)$/a$(TARGET).lib
LIB1FILES=	$(SLB)$/fontsubset.lib
.ENDIF
.ELSE

LIB1TARGET= $(SLB)$/$(TARGET).lib

Lines 77-82 Link Here

(-)oo_1.1.1_src/python/makefile.mk.orig (-1 / +27 lines)
77		77
78	BUILD_DIR=	78	BUILD_DIR=
79		79
		80	PWDCMD=pwd
		81	ADDITIONAL_FILES=Lib/plat-cygwin Python/fileblocks.c
		82
80	.IF "$(GUI)"=="UNX"	83	.IF "$(GUI)"=="UNX"
81	.IF "$(COMNAME)"=="sunpro5"	84	.IF "$(COMNAME)"=="sunpro5"
82	.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"	85	.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
Lines 117-122 Link Here
117	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)	120	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
118	.ENDIF	121	.ENDIF
119	.ELSE	122	.ELSE
		123	.IF "$(COM)"=="GCC"
		124	PWDCMD=cygpath -m `pwd`
		125	CONFIGURE_ACTION= sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" DEFS="-mthreads" LIBS="-L$(CYGLIB) -mthreads" ./configure --prefix=../python-inst --with-threads'
		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
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 223-228 Link Here
223	.ELSE	237	.ELSE
224	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)	238	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
225	.ENDIF	239	.ENDIF
		240	.ELSE
		241	.IF "$(COM)"=="GCC"
		242	$(PYTHONCORESHL) : makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
		243	cp $(MISC)$/build$/$(TARFILE_NAME)$/python$(PYMAJOR)$(PYMINOR).dll $@
		244
		245	$(PYTHONCORELINK1) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
		246	-rm -f $@
		247	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
		248
		249	$(PYTHONCORELINK2) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
		250	-rm -f $@
		251	cd $(OUT)$/bin && ln -s $(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
		252	.ENDIF
226	.ENDIF	253	.ENDIF
227		254
228	$(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)	255	$(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
Lines 230-233 Link Here
230	cat $? > $@	257	cat $? > $@
231		258
232	patch : $(MISC)$/convert_dos_flag	259	patch : $(MISC)$/convert_dos_flag
233





# --- Settings -----------------------------------------------------

.INCLUDE :  settings.mk
.INCLUDE :  pyversion.mk
.INCLUDE :  settings.mk
#-------------------------------------------------------------------

CFLAGS+=-I$(SOLARINCDIR)$/python

# so this library cannot be checked
SHL1NOCHECK=yes
PYUNORC=pyunorc
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
PYTHONLIB=-lpython
.ENDIF
.ELSE
# on windows, the python executable also uses the shared library,
# so we link pyuno directly to it
PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
PYUNORC=pyuno.ini
.ENDIF






# --- Settings -----------------------------------------------------

.INCLUDE :  pyversion.mk
.INCLUDE :  settings.mk

DLLPRE = 

.INCLUDE :  pyversion.mk
#-------------------------------------------------------------------

CFLAGS+=-I$(SOLARINCDIR)$/python

DIRECT = $(LINKFLAGSDEFS)
.ENDIF

.IF "$(GUI)" == "UNX"
PYUNOLIB=-lpyuno
PYTHONLIB=-lpython
.ELSE
PYUNOLIB=ipyuno.lib
PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
.ENDIF

SHL1TARGET=	$(TARGET)

SHL1STDLIBS= \

.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

Lines 73-79 Link Here

(-)oo_1.1.1_src/readlicense_oo/html/makefile.mk.orig (-1 / +3 lines)
73		73
74	# --- Files --------------------------------------------------------	74	# --- Files --------------------------------------------------------
75		75
76	all: $(MISC)$/THIRDPARTYLICENSEREADME.html	76	all: $(MISC)$/THIRDPARTYLICENSEREADME.html $(MISC)$/InstGuide_11_win.pdf
77		77
78	# --- Targets ------------------------------------------------------	78	# --- Targets ------------------------------------------------------
79		79
Lines 81-86 Link Here
81		81
82	$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html	82	$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
83	+-$(COPY) THIRDPARTYLICENSEREADME.html $@	83	+-$(COPY) THIRDPARTYLICENSEREADME.html $@
		84	$(MISC)$/InstGuide_11_win.pdf: InstGuide_11_win.pdf
		85	+-$(COPY) InstGuide_11_win.pdf $@
84		86
85		87
86		88

Lines 67-77 Link Here

(-)oo_1.1.1_src/sablot/makefile.mk.orig (-2 / +3 lines)
67		67
68	# --- Settings -----------------------------------------------------	68	# --- Settings -----------------------------------------------------
69		69
		70	.IF "$(COM)"=="GCC"
		71	CFLAGSCXX+=-frtti
		72	.ELSE
70	.IF "$(GUI)"=="WNT"	73	.IF "$(GUI)"=="WNT"
71	CFLAGS+=-GR	74	CFLAGS+=-GR
72	.ENDIF	75	.ENDIF
73	.IF "$(COM)"=="GCC"
74	CFLAGSCXX+=-frtti
75	.ENDIF	76	.ENDIF
76		77
77	.INCLUDE : settings.mk	78	.INCLUDE : settings.mk




SHL1VERSIONMAP=	$(TARGET).map

.IF "$(GUI)"=="WNT"
.IF "$(COM)"!="GCC"
SHL1STDLIBS=	\
				$(UWINAPILIB)\
				$(ADVAPI32LIB)\
				$(WSOCK32LIB)\
				$(MPRLIB)\
				$(SHELL32LIB)\
				$(OLE32LIB)
				user32.lib\
				ole32.lib
.ELSE
SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32
.ENDIF # GCC
.ENDIF # WNT

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

SHL1OBJS= \
    $(OBJ)$/dllentry.obj
.ELSE
.IF "$(GUI)"!="WNT" || "$(COM)"!="GCC"
SHL1OBJS= \
    $(SLO)$/dllentry.obj
.ELSE
SHL1OBJS=
.ENDIF
.ENDIF # MAC
.ENDIF # UNX
.ENDIF # lincinc




SHL1IMPLIB=$(SHL1TARGET)
SHL1DEF=$(MISC)/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
.IF "$(COM)"=="GCC"
DEF1EXPORTFILE=\
	$(SHL1TARGET)_mingw.dxp\
	unicows_mingw.dxp
.ELSE
DEF1EXPORTFILE=\
	$(SHL1TARGET).dxp\
	unicows.dxp
.ENDIF
DEF1DEPN=\
		$(DEF1EXPORTFILE)\
		makefile.mk

#No default libraries
STDSHL=

.IF "$(COM)"=="GCC"
SHL1STDLIBS=\
		-lmingw32 \
		-lgcc
.ELSE
SHL1STDLIBS=
.ENDIF

SHL1STDLIBS+=\
		$(UNICOWSLIB)\
		$(KERNEL32LIB)\
		$(USER32LIB)\
		$(ADVAPI32LIB)\
		$(VERSIONLIB)\
		$(MSVCRTLIB)

		
.ENDIF


.INCLUDE : target.mk


Lines 81-87 Link Here

(-)oo_1.1.1_src/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 81-88 Link Here

(-)oo_1.1.1_src/salhelper/test/rtti/makefile.mk.orig (+2 lines)
81		81
82	#RTTI on	82	#RTTI on
83	.IF "$(OS)" == "WNT"	83	.IF "$(OS)" == "WNT"
		84	.IF "$(COM)" != "GCC"
84	CFLAGS+= -GR	85	CFLAGS+= -GR
85	.ENDIF	86	.ENDIF
		87	.ENDIF
86		88
87	SLOFILES= \	89	SLOFILES= \
88	$(SLO)$/samplelibrtti.obj	90	$(SLO)$/samplelibrtti.obj

Lines 81-88 Link Here

(-)oo_1.1.1_src/salhelper/test/dynamicloader/makefile.mk.orig (+2 lines)
81		81
82	#RTTI on	82	#RTTI on
83	.IF "$(OS)" == "WNT"	83	.IF "$(OS)" == "WNT"
		84	.IF "$(COM)" != "GCC"
84	CFLAGS+= -GR	85	CFLAGS+= -GR
85	.ENDIF	86	.ENDIF
		87	.ENDIF
86		88
87		89
88	# UNOTYPES= com.sun.star.lang.XInitialization \	90	# UNOTYPES= com.sun.star.lang.XInitialization \

Lines 79-86 Link Here

(-)oo_1.1.1_src/salhelper/test/Symbols/makefile.mk.orig (+2 lines)
79		79
80	#RTTI on	80	#RTTI on
81	.IF "$(OS)" == "WNT"	81	.IF "$(OS)" == "WNT"
		82	.IF "$(COM)" != "GCC"
82	CFLAGS+= -GR	83	CFLAGS+= -GR
83	.ENDIF	84	.ENDIF
		85	.ENDIF
84		86
85		87
86	#---------------------------------------------------------------------------	88	#---------------------------------------------------------------------------

Lines 77-83 Link Here

(-)oo_1.1.1_src/salhelper/source/makefile.mk.orig (+4 lines)
77	.INCLUDE : settings.mk	77	.INCLUDE : settings.mk
78		78
79	.IF "$(OS)" == "WNT"	79	.IF "$(OS)" == "WNT"
		80	.IF "$(COM)" != "GCC"
80	CFLAGS+= -GR # enable RTTI	81	CFLAGS+= -GR # enable RTTI
		82	.ENDIF
81	.ENDIF # WNT	83	.ENDIF # WNT
82		84
83	# --- Files --------------------------------------------------------	85	# --- Files --------------------------------------------------------
Lines 118-123 Link Here
118	SHL1VERSIONMAP=lngi.map	120	SHL1VERSIONMAP=lngi.map
119	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"	121	.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
120	SHL1VERSIONMAP=gcc3_linux_intel.map	122	SHL1VERSIONMAP=gcc3_linux_intel.map
		123	.ELIF "$(GUI)$(COM)"=="WNTGCC"
		124	SHL1VERSIONMAP=gcc3_linux_intel.map
121	.ENDIF	125	.ENDIF
122		126
123	# --- Targets ------------------------------------------------------	127	# --- Targets ------------------------------------------------------




SHL1LIBS=   $(LIB3TARGET) $(LIB4TARGET)

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

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


    @echo ------------------------------
    @echo Making: $@
    @echo LIBRARY     $(SHL1TARGET)                                  >$@
.IF "$(COM)"!="GCC"
    @echo DESCRIPTION 'SCALC3 DLL'                                 >>$@
    @echo DATA        READ WRITE NONSHARED                          >>$@
.ENDIF
    @echo EXPORTS                                                   >>$@
    @echo   CreateScDocShellDll @20                            >>$@
    @echo   CreateObjScDocShellDll @21                         >>$@

Lines 93-100 Link Here

(-)oo_1.1.1_src/sc/addin/rot13/makefile.mk.orig (-2 / +2 lines)
93	DEF1NAME=$(SHL1TARGET)	93	DEF1NAME=$(SHL1TARGET)
94		94
95	.IF "$(GUI)" == "WNT"	95	.IF "$(GUI)" == "WNT"
96	SHL1STDLIBS= gdi32.lib advapi32.lib comdlg32.lib \	96	SHL1STDLIBS= $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
97	uuid.lib ole32.lib shell32.lib winspool.lib	97	$(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
98	.IF "$(GVER)" == "W40"	98	.IF "$(GVER)" == "W40"
99	SHL1STDLIBS= $(SHL1STDLIBS) comctl32.lib	99	SHL1STDLIBS= $(SHL1STDLIBS) comctl32.lib
100	.ENDIF # W40	100	.ENDIF # W40




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

.IF "$(GUI)" == "WNT"
SHL1STDLIBS=     $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
				 $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
.IF "$(GVER)" == "W40"
SHL1STDLIBS=    $(SHL1STDLIBS) comctl32.lib
.ENDIF

    @echo ------------------------------
    @echo Making: $@
    @echo LIBRARY     $(SHL1TARGET)>$@
.IF "$(COM)"!="GCC"
    @echo DESCRIPTION 'DateF StarCalc Addin DLL'>>$@
    @echo DATA        READ WRITE NONSHARED>>$@
.ENDIF
    @echo EXPORTS>>$@
    @echo     GetFunctionCount>>$@
    @echo     GetFunctionData>>$@

Lines 139-145 Link Here

(-)oo_1.1.1_src/sch/util/makefile.mk.orig (+2 lines)
139	SHL1LIBS= $(LIB3TARGET)	139	SHL1LIBS= $(LIB3TARGET)
140		140
141	.IF "$(GUI)"!="UNX"	141	.IF "$(GUI)"!="UNX"
		142	.IF "$(GUI)$(COM)"!="WNTGCC"
142	SHL1OBJS= $(SLO)$/schdll.obj	143	SHL1OBJS= $(SLO)$/schdll.obj
		144	.ENDIF
143	.ENDIF # ! UNX	145	.ENDIF # ! UNX
144		146
145	.IF "$(GUI)" == "WNT" \|\| "$(GUI)" == "WIN"	147	.IF "$(GUI)" == "WNT" \|\| "$(GUI)" == "WIN"

Lines 77-84 Link Here

(-)oo_1.1.1_src/sch/source/ui/unoidl/makefile.mk.orig (+2 lines)
77		77
78		78
79	.IF "$(GUI)" == "WNT"	79	.IF "$(GUI)" == "WNT"
		80	.IF "$(COM)" != "COM"
80	CFLAGS+=-Zm500	81	CFLAGS+=-Zm500
81	.ENDIF	82	.ENDIF
		83	.ENDIF
82		84
83	# --- Files --------------------------------------------------------	85	# --- Files --------------------------------------------------------
84		86




.IF "$(GUI)"=="UNX"
APP4STDLIBS		= -lbtstrp
.ELSE
.IF "$(COM)"=="GCC"
APP4STDLIBS		+= -lbtstrp_static
.ELSE
APP4STDLIBS		= $(L)$/bootstrp.lib
.ENDIF
.ENDIF
APP4STDLIBS		+= $(SALLIB) $(TOOLSLIB) $(SVTOOLLIB) $(SETUPLIB) $(VOSLIB)

.IF "$(GUI)"=="WNT"
APP4STDLIBS		+= $(WS2_32LIB)
.ENDIF

APP4OBJS		= $(OBJ)$/lzip.obj	\

APP5STDLIBS		+= $(CPPULIB)
.ENDIF
.IF "$(GUI)"=="WNT"
APP5STDLIBS		+= $(WS2_32LIB)
.ENDIF
APP5OBJS		= $(OBJ)$/websnooper.obj


Lines 270-277 Link Here

(-)oo_1.1.1_src/sd/util/makefile.mk.orig (+2 lines)
270	@echo ------------------------------	270	@echo ------------------------------
271	@echo Making: $@	271	@echo Making: $@
272	@echo LIBRARY $(SHL1TARGET) >$@	272	@echo LIBRARY $(SHL1TARGET) >$@
		273	.IF "$(COM)"!="GCC"
273	@echo DESCRIPTION 'SDRAW3 DLL' >>$@	274	@echo DESCRIPTION 'SDRAW3 DLL' >>$@
274	@echo DATA READ WRITE NONSHARED >>$@	275	@echo DATA READ WRITE NONSHARED >>$@
		276	.ENDIF
275	@echo EXPORTS >>$@	277	@echo EXPORTS >>$@
276	@echo CreateSdDrawDocShellDll @20 >>$@	278	@echo CreateSdDrawDocShellDll @20 >>$@
277	@echo CreateSdGraphicDocShellDll @21 >>$@	279	@echo CreateSdGraphicDocShellDll @21 >>$@

Lines 85-91 Link Here

(-)oo_1.1.1_src/setup2/win/source/unloader/makefile.mk.orig (-1 / +1 lines)
85	APP1TARGET= $(TARGET)	85	APP1TARGET= $(TARGET)
86		86
87	.IF "$(GUI)"=="WNT"	87	.IF "$(GUI)"=="WNT"
88	APP1STDLIBS= gdi32.lib	88	APP1STDLIBS= $(GDI32LIB)
89	.ENDIF	89	.ENDIF
90		90
91	APP1OBJS= $(OBJ)$/unloader.obj	91	APP1OBJS= $(OBJ)$/unloader.obj

Lines 81-87 Link Here

(-)oo_1.1.1_src/setup2/win/source/system/makefile.mk.orig (-1 / +1 lines)
81	$(SLO)$/winos.obj	81	$(SLO)$/winos.obj
82		82
83	LIB1TARGET= $(SLB)$/$(TARGET).lib	83	LIB1TARGET= $(SLB)$/$(TARGET).lib
84	LIB1FILES= $(SLOFILES)	84	LIB1OBJFILES= $(SLOFILES)
85		85
86	# --- Targets ------------------------------------------------------	86	# --- Targets ------------------------------------------------------
87		87




	-lXext
.ENDIF # "$(OS)"!="MACOSX"
.ELSE  # "$(GUI)"=="UNX"
.IF "$(COM)"!="GCC"
SHL1OBJS = $(SLO)$/agenda.obj
.ENDIF
SHL1STDLIBS+= $(SVUNZIPDLL)
.ENDIF # "$(GUI)"=="UNX"

.IF "$(GUI)"=="WNT"
SHL1STDLIBS += \
		$(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
		$(WINMMLIB)
.ENDIF # "$(GUI)"=="WNT"

DEF1NAME    =$(SHL1TARGET)

.ENDIF

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
APP2DEPN+= $(LB)$/libset$(UPD)$(DLLPOSTFIX).a
APP2STDLIBS += -lset$(UPD)$(DLLPOSTFIX)
.ENDIF
APP2STDLIBS += $(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
		$(WINMMLIB)
.ENDIF # "$(GUI)"=="WNT"

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

	makefile.mk

.IF "$(GUI)" != "UNX"
.IF "$(GUI)$(COM)" != "WNTGCC"
APP2OBJS+=\
		$(OBJ)$/main.obj		\
		$(OBJ)$/mainwnd.obj		\
		$(OBJ)$/mainevt.obj		\
		$(OBJ)$/magenda.obj		\
		$(OBJ)$/textani.obj
.ENDIF
.ENDIF # "$(GUI)" != "UNX"

APP2DEF=   $(MISCX)$/$(TARGET).def

APP3TARGET=loader

.IF "$(GUI)"=="WNT"
APP3STDLIBS=$(SVUNZIPLIB)
.IF "$(COM)"!="GCC"
APP3STDLIBS+=libcmt.lib
.ENDIF
APP3STDLIBS+=$(GDI32LIB) $(ADVAPI32LIB) $(SHELL32LIB)
.ENDIF

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

.IF "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=\$$
REGCOMP_ENV=\
	setenv CLASSPATH "$(strip $(subst,\,/ $(shell $(WRAPCMD) echo $(REGCOMP_CLASSPATH))))" && \
	setenv PATH "$(PATH):$(JREPATH)"
MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR))))
.ELSE # "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=$$
REGCOMP_ENV=\





CFLAGS +=  -DHAVE_EXPAT_H

.IF "$(COM)"=="GCC"
CFLAGSCXX+=-frtti
.ELSE
.IF "$(GUI)"=="WNT"
CFLAGS+=-GR
.ENDIF
.IF "$(COM)"=="GCC"
CFLAGSCXX+=-frtti
.ENDIF

.IF "$(SABLOT3RDLIB)"==""
.IF "$(GUI)"=="UNX"
SABLOT3RDLIB=-lsablot
.ENDIF # unx
.IF "$(GUI)"=="WNT"
SABLOT3RDLIB=sablot.lib
.ENDIF # wnt
.ENDIF # sablot3rdlib

.IF "$(OS)"=="MAC"
SHL1STDLIBS= \
            $(TOOLSLIB)  \

            $(TOOLSLIB)  \
            $(SALLIB) \
            $(SABLOT3RDLIB) \
            $(TOOLSLIB)  \
            $(SALLIB) \
            $(EXPATASCII3RDLIB) \
            $(SETUPLIB)
.ENDIF





SHL1TARGET=     $(TARGET)$(VERSION)$(DLLPOSTFIX)
SHL1IMPLIB=	i$(TARGET)
SHL1LIBS=       $(LIB1TARGET)			\
	$(SLB)$/sicustom.lib
.IF "$(COM)"!="GCC"
SHL1OBJS=       $(SLO)$/sample.obj
.ENDIF
SHL1DEPN=	$(L)$/itools.lib $(SVLIBDEPEND)
SHL1STDLIBS=\
	$(SALLIB) \
	$(SVLIB)				\
		$(TOOLSLIB)				\
		$(SVMEMLIB)
		$(SLB)$/sicustom.lib

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


	@echo ------------------------------
	@echo Making: $@
	@echo LIBRARY	$(TARGET)$(VERSION)$(DLLPOSTFIX)	>$@
.IF "$(COM)"!="GCC"
	@echo CODE	PRELOAD MOVEABLE DISCARDABLE		>>$@
	@echo DATA	PRELOAD SINGLE				>>$@
.ENDIF
	@echo EXPORTS						>>$@
.IF "$(GUI)"=="WIN"
	@echo _CustomInit					>>$@

Lines 73-79 Link Here

(-)oo_1.1.1_src/setup2/source/custom/regactivex/makefile.mk.orig (-2 / +6 lines)
73	# --- Files --------------------------------------------------------	73	# --- Files --------------------------------------------------------
74		74
75	.DIRCACHE=NO	75	.DIRCACHE=NO
		76	.IF "$(COM)"=="GCC"
		77	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		78	.ELSE
76	CFLAGS+=-GX	79	CFLAGS+=-GX
		80	.ENDIF
77		81
78	SLOFILES = $(SLO)$/regactivex.obj	82	SLOFILES = $(SLO)$/regactivex.obj
79		83
Lines 81-88 Link Here
81	$(SALLIB)\	85	$(SALLIB)\
82	$(SVTOOLLIB) \	86	$(SVTOOLLIB) \
83	$(TOOLSLIB) \	87	$(TOOLSLIB) \
84	advapi32.lib\	88	$(ADVAPI32LIB)\
85	shell32.lib	89	$(SHELL32LIB)
86		90
87	SHL1LIBS = $(SLB)$/$(TARGET).lib	91	SHL1LIBS = $(SLB)$/$(TARGET).lib
88		92

Lines 73-79 Link Here

(-)oo_1.1.1_src/setup2/source/custom/reg4msdoc/makefile.mk.orig (-2 / +6 lines)
73	# --- Files --------------------------------------------------------	73	# --- Files --------------------------------------------------------
74		74
75	.DIRCACHE=NO	75	.DIRCACHE=NO
		76	.IF "$(COM)"=="GCC"
		77	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		78	.ELSE
76	CFLAGS+=-GX	79	CFLAGS+=-GX
		80	.ENDIF
77		81
78	SRCFILES = preg4msdoc.src	82	SRCFILES = preg4msdoc.src
79		83
Lines 100-107 Link Here
100	$(TOOLSLIB) \	104	$(TOOLSLIB) \
101	$(CPPULIB) \	105	$(CPPULIB) \
102	$(SALLIB)\	106	$(SALLIB)\
103	advapi32.lib\	107	$(ADVAPI32LIB)\
104	shell32.lib	108	$(SHELL32LIB)
105		109
106	SHL1LIBS = $(SLB)$/$(TARGET).lib	110	SHL1LIBS = $(SLB)$/$(TARGET).lib
107		111

Lines 89-96 Link Here

(-)oo_1.1.1_src/setup2/source/custom/moffice/makefile.mk.orig (-1 / +8 lines)
89	SHL1OBJS += $(SLO)$/arch.obj \	89	SHL1OBJS += $(SLO)$/arch.obj \
90	$(SLO)$/sifsys.obj	90	$(SLO)$/sifsys.obj
91		91
		92	.IF "$(GUI)$(COM)"=="WNTGCC"
		93	SHL1OBJS += $(SLO)$/winos.obj
		94	.ENDIF
		95
92	.IF "$(GUI)"=="WNT"	96	.IF "$(GUI)"=="WNT"
93	SHL1STDLIBS += $(SLO)$/winos.obj uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib winmm.lib	97	.IF "$(COM)"!="GCC"
		98	SHL1STDLIBS += $(SLO)$/winos.obj
		99	.ENDIF
		100	SHL1STDLIBS += $(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) $(WINMMLIB)
94	.ENDIF	101	.ENDIF
95		102
96	.IF "$(GUI)"=="UNX"	103	.IF "$(GUI)"=="UNX"




				

.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= $(ADVAPI32LIB)
.ENDIF
SHL1LIBS =	$(SLB)$/$(TARGET).lib $(SLB)$/sicustom.lib


	@echo -------------------------------------------
	@echo DEF-File erstellen
	@echo LIBRARY     $(DLLNAME)	   >$@
.IF "$(COM)"!="GCC"
	@echo DESCRIPTION 'DEL DLL'	   >>$@
	@echo DATA READ WRITE NONSHARED	   >>$@
.ENDIF
	@echo EXPORTS			   >>$@
.IF "$(GUI)"=="WIN"
	@echo _CustomInit		   >>$@




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

SHL1STDLIBS+=\
		$(UWINAPILIB) \
		$(ADVAPI32LIB) \
		$(SHELL32LIB) \
		$(GDI32LIB) \
		$(OLE32LIB) \
		$(UUIDLIB)

.ENDIF # WNT


Lines 77-84 Link Here

(-)oo_1.1.1_src/sfx2/source/control/makefile.mk.orig (+2 lines)
77		77
78	# w.g. compilerbugs	78	# w.g. compilerbugs
79	.IF "$(GUI)"=="WNT"	79	.IF "$(GUI)"=="WNT"
		80	.IF "$(COM)"!="GCC"
80	CFLAGS+=-Od	81	CFLAGS+=-Od
81	.ENDIF	82	.ENDIF
		83	.ENDIF
82		84
83	# --- Files --------------------------------------------------------	85	# --- Files --------------------------------------------------------
84		86

Lines 78-85 Link Here

(-)oo_1.1.1_src/sfx2/source/appl/makefile.mk.orig (+2 lines)
78		78
79	# w.g. compilerbugs	79	# w.g. compilerbugs
80	.IF "$(GUI)"=="WNT"	80	.IF "$(GUI)"=="WNT"
		81	.IF "$(COM)"!="GCC"
81	CFLAGS+=-Od	82	CFLAGS+=-Od
82	.ENDIF	83	.ENDIF
		84	.ENDIF
83		85
84	# --- Files --------------------------------------------------------	86	# --- Files --------------------------------------------------------
85		87

Lines 79-85 Link Here

(-)oo_1.1.1_src/shell/source/win32/workbench/makefile.mk.orig (+4 lines)
79		79
80	# --- Files --------------------------------------------------------	80	# --- Files --------------------------------------------------------
81		81
		82	.IF "$(COM)"=="GCC"
		83	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		84	.ELSE
82	CFLAGS+=/GX	85	CFLAGS+=/GX
		86	.ENDIF
83		87
84	OBJFILES1=$(OBJ)$/TestSysShExec.obj	88	OBJFILES1=$(OBJ)$/TestSysShExec.obj
85	OBJFILES2=$(OBJ)$/TestSmplMail.obj	89	OBJFILES2=$(OBJ)$/TestSmplMail.obj

Lines 64-69 Link Here

(-)oo_1.1.1_src/shell/source/win32/sysshell/makefile.mk.orig (-1 / +4 lines)
64		64
65	PRJNAME=SHELL	65	PRJNAME=SHELL
66	TARGET=sysshell	66	TARGET=sysshell
		67	LIBTARGET=NO
67		68
68	# --- Settings -----------------------------------------------------	69	# --- Settings -----------------------------------------------------
69		70
Lines 71-77 Link Here
71		72
72	# --- Files --------------------------------------------------------	73	# --- Files --------------------------------------------------------
73		74
74	SLOFILES= $(SLO)$/systemshell.obj	75	LIB1OBJFILES=$(SLO)$/systemshell.obj
		76	LIB1TARGET= $(SLB)$/$(TARGET).lib
		77	LIB1ARCHIV= $(SLB)$/lib$(TARGET).a
75		78
76	# --- Targets ------------------------------------------------------	79	# --- Targets ------------------------------------------------------
77		80




    
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=$(ZLIB3RDLIB)\
    $(EXPAT3RDLIB)\
    $(UWINAPILIB)\
    $(OLEAUT32LIB)\
    $(ADVAPI32LIB)\
    $(OLE32LIB)\
    $(UUIDLIB)\
    $(SHELL32LIB)\
    $(COMCTL32LIB)\
    $(GDI32LIB)
    
.ENDIF
    $(SOLARLIBDIR)$/expat_xmlparse.lib\
    $(SOLARLIBDIR)$/expat_xmltok.lib

SHL1DEPN=


OBJFILES=$(OBJ)$/regsvrex.obj
APP1TARGET=$(TARGET1)
APP1OBJS=$(OBJFILES)
APP1STDLIBS=kernel32.lib
APP1DEF=$(MISC)$/$(APP1TARGET).def

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

Lines 84-92 Link Here

(-)oo_1.1.1_src/shell/source/win32/makefile.mk.orig (-3 / +3 lines)
84	SHL1STDLIBS=$(CPPULIB)\	84	SHL1STDLIBS=$(CPPULIB)\
85	$(CPPUHELPERLIB)\	85	$(CPPUHELPERLIB)\
86	$(SALLIB)\	86	$(SALLIB)\
87	uwinapi.lib \	87	$(UWINAPILIB) \
88	advapi32.lib \	88	$(ADVAPI32LIB) \
89	shell32.lib	89	$(SHELL32LIB)
90		90
91	SHL1DEPN=	91	SHL1DEPN=
92	SHL1IMPLIB=i$(SHL1TARGET)	92	SHL1IMPLIB=i$(SHL1TARGET)

Lines 74-80 Link Here

(-)oo_1.1.1_src/shell/source/tools/lngconvex/makefile.mk.orig (-2 / +9 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 86-93 Link Here
86		90
87	APP1STDLIBS= $(SALLIB)\	91	APP1STDLIBS= $(SALLIB)\
88	$(TOOLSLIB)\	92	$(TOOLSLIB)\
89	$(SOLARLIBDIR)$/atools.lib\	93	$(TOOLSLIBST)
90	msvcprt.lib	94
		95	.IF "$(COM)"!="GCC"
		96	APP1STDLIBS+= msvcprt.lib
		97	.ENDIF
91		98
92	# --- Targets ------------------------------------------------------	99	# --- Targets ------------------------------------------------------
93		100





.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= \
			$(OLE32LIB) $(UUIDLIB) $(ADVAPI32LIB) $(GDI32LIB)
.ENDIF

.IF "$(GUI)"=="WIN"

SHL1STDLIBS+=$(SJLIB)
.ENDIF

.IF "$(GUI)"=="UNX"||"$(GUI)$(COM)"=="WNTGCC"
SHL1DEPN=	$(L)$/itools.lib $(LIB1TARGET)
.ELSE
SHL1DEPN=	$(L)$/itools.lib $(LIB1TARGET)


.IF "$(linkinc)" == ""
.IF "$(GUI)"=="WNT"
.IF "$(COM)"!="GCC"
SHL1OBJS+=	$(SLO)$/so2dll.obj					\
			$(SHLOBJECTS)

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

.ELSE			#"$(linkinc)" == ""

Lines 74-83 Link Here

(-)oo_1.1.1_src/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 110-116 Link Here

(-)oo_1.1.1_src/starmath/util/makefile.mk.orig (+2 lines)
110	SHL1LIBS= $(SLB)$/starmath.lib	110	SHL1LIBS= $(SLB)$/starmath.lib
111		111
112	.IF "$(GUI)" != "UNX"	112	.IF "$(GUI)" != "UNX"
		113	.IF "$(GUI)$(COM)"!="WNTGCC"
113	SHL1OBJS= $(SLO)$/smdll.obj	114	SHL1OBJS= $(SLO)$/smdll.obj
		115	.ENDIF
114	.ENDIF # ! UNX	116	.ENDIF # ! UNX
115		117
116	.IF "$(GUI)" == "WNT"	118	.IF "$(GUI)" == "WNT"




		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$/sunpro8.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= \

.INCLUDE :	tg_ext.mk

.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 108-114 Link Here

(-)oo_1.1.1_src/stoc/source/javavm/makefile.mk.orig (-1 / +1 lines)
108	$(SALHELPERLIB)	108	$(SALHELPERLIB)
109		109
110	.IF "$(GUI)"=="WNT"	110	.IF "$(GUI)"=="WNT"
111	SHL1STDLIBS += advapi32.lib	111	SHL1STDLIBS += $(ADVAPI32LIB)
112	.ENDIF	112	.ENDIF
113		113
114	SHL1DEPN=	114	SHL1DEPN=

Lines 102-113 Link Here

(-)oo_1.1.1_src/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" \|\| "$(OS)"=="NETBSD" \|\| "$(OS)"=="MACOSX"	108	.IF "$(OS)"=="FREEBSD" \|\| "$(OS)"=="NETBSD" \|\| "$(OS)"=="MACOSX"
106	SHL1STDLIBS+= -lsupc++	109	SHL1STDLIBS+= -lsupc++
107	.ELSE	110	.ELSE
108	SHL1STDLIBS+= -lsupc++ -lgcc_s	111	SHL1STDLIBS+= -lsupc++ -lgcc_s
109	.ENDIF	112	.ENDIF
110	.ENDIF	113	.ENDIF
		114	.ENDIF
111		115
112		116
113	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	117	SHL1DEF= $(MISC)$/$(SHL1TARGET).def




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


.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= \
		$(UWINAPILIB) \
		$(ADVAPI32LIB) \
		$(GDI32LIB) \
		$(OLE32LIB) 	\
		$(UUIDLIB) 	\
		$(OLEAUT32LIB)
		oleaut32.lib
.ENDIF # WNT

SHL1LIBS= \


.IF "$(GUI)"=="WNT"
SHL2STDLIBS+= \
		$(UWINAPILIB) \
		$(ADVAPI32LIB) \
		$(GDI32LIB)
.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)"==""

Lines 114-122 Link Here

(-)oo_1.1.1_src/svx/util/makefile.mk.orig (-1 / +12 lines)
114	.ENDIF # WNT	114	.ENDIF # WNT
115		115
116	.IF "$(BIG_SVX)"==""	116	.IF "$(BIG_SVX)"==""
		117	.IF "$(GUI)$(COM)"=="WNTGCC"
		118	SHL1STDLIBS+=\
		119	-ldl$(UPD)$(DLLPOSTFIX)
		120	.ELSE
117	SHL1STDLIBS+=\	121	SHL1STDLIBS+=\
118	$(LB)$/dl.lib	122	$(LB)$/dl.lib
119	.ENDIF	123	.ENDIF
		124	.ENDIF
120		125
121	.IF "$(GUI)"=="WNT"	126	.IF "$(GUI)"=="WNT"
122	SHL1DEPN= $(SLB)$/svx.lib $(LB)$/dl.lib	127	SHL1DEPN= $(SLB)$/svx.lib $(LB)$/dl.lib
Lines 138-145 Link Here
138	SHL2IMPLIB= dl	143	SHL2IMPLIB= dl
139	SVXLOKAL+= $(LB)$/dl.lib	144	SVXLOKAL+= $(LB)$/dl.lib
140	SHL2BASE = 0x1db00000	145	SHL2BASE = 0x1db00000
		146	.IF "$(GUI)$(COM)"=="WNTGCC"
141	SHL2STDLIBS= \	147	SHL2STDLIBS= \
142	$(LB)$/svx.lib \	148	-lsvx$(UPD)$(DLLPOSTFIX)
		149	.ELSE
		150	SHL2STDLIBS= \
		151	$(LB)$/svx.lib
		152	.ENDIF
		153	SHL2STDLIBS+= \
143	$(SALLIB) \	154	$(SALLIB) \
144	$(VOSLIB) \	155	$(VOSLIB) \
145	$(TOOLSLIB) \	156	$(TOOLSLIB) \

Lines 157-164 Link Here

(-)oo_1.1.1_src/sw/workben/makefile.mk.orig (+2 lines)
157	@echo ------------------------------	157	@echo ------------------------------
158	@echo Making: $@	158	@echo Making: $@
159	@echo LIBRARY $(SHL2TARGET) >$@	159	@echo LIBRARY $(SHL2TARGET) >$@
		160	.IF "$(COM)" != "GCC"
160	@echo DESCRIPTION 'StarOne Test-DLL' >>$@	161	@echo DESCRIPTION 'StarOne Test-DLL' >>$@
161	@echo DATA READ WRITE NONSHARED >>$@	162	@echo DATA READ WRITE NONSHARED >>$@
		163	.ENDIF
162	@echo EXPORTS >>$@	164	@echo EXPORTS >>$@
163	@echo CreateWindow @2 >>$@	165	@echo CreateWindow @2 >>$@
164	.ENDIF	166	.ENDIF




.ENDIF

.IF "$(GUI)"=="WNT"
SHL2STDLIBS+= $(ADVAPI32LIB)
.ENDIF # WNT

#			uno.lib usr.lib sj.lib aofa.lib

    @echo ------------------------------
    @echo Making: $@
    @echo LIBRARY     $(SHL2TARGET)                                  >$@
.IF "$(COM)" != "GCC"
    @echo DESCRIPTION 'SWriter4 DLL'                                 >>$@
    @echo DATA        READ WRITE NONSHARED                          >>$@
.ENDIF
    @echo EXPORTS                                                   >>$@
    @echo   CreateSwDocShellDll @20                            >>$@
    @echo   CreateSwWebDocShellDll @30                            >>$@




APP1LIBS=$(LIB1TARGET)

.IF "$(GUI)" == "WNT"
APP1STDLIBS= $(SVTOOLLIB) $(SVLLIB) $(TOOLSLIB) $(SVLIB) $(SVMEMLIB) $(SO2LIB)
# irtl.lib
.IF "$(SO3)" == ""
APP1STDLIBS+= sdstor.lib
.ELSE
APP1STDLIBS+= $(SOTLIB)
.ENDIF
APP1STDLIBS+= $(OLD32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB)
.IF "$(COM)" != "GCC"
APP1STDLIBS+= libci.lib msvcirt.lib
.ENDIF
APP1STDLIBS+= ole32.lib oleaut32.lib uuid.lib shell32.lib advapi32.lib libci.lib msvcirt.lib
.ELSE
.IF "$(GUI)" == "OS2"
APP1STDLIBS=sdstor.lib so2.lib svtool.lib $(SVLIB) tools.lib svmem.lib svx.lib

Lines 71-77 Link Here

(-)oo_1.1.1_src/sysui/source/win32/misc/makefile.mk.orig (+4 lines)
71		71
72	.INCLUDE : ..$/..$/cppumaker.mk	72	.INCLUDE : ..$/..$/cppumaker.mk
73		73
		74	.IF $(COM)=="GCC"
		75	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		76	.ELSE
74	CFLAGS+=/GX	77	CFLAGS+=/GX
		78	.ENDIF
75		79
76	# --- Files -------------------------------------	80	# --- Files -------------------------------------
77		81

Lines 75-81 Link Here

(-)oo_1.1.1_src/sysui/source/win32/folderpicker/workbench/makefile.mk.orig (+4 lines)
75		75
76	.INCLUDE : ..$/..$/..$/cppumaker.mk	76	.INCLUDE : ..$/..$/..$/cppumaker.mk
77		77
		78	.IF $(COM)=="GCC"
		79	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		80	.ELSE
78	CFLAGS+=/GR /GX	81	CFLAGS+=/GR /GX
		82	.ENDIF
79		83
80	# --- Files --------------------------------------------------------	84	# --- Files --------------------------------------------------------
81		85

Lines 73-79 Link Here

(-)oo_1.1.1_src/sysui/source/win32/filepicker/workbench/makefile.mk.orig (+4 lines)
73		73
74	.INCLUDE : ..$/..$/..$/cppumaker.mk	74	.INCLUDE : ..$/..$/..$/cppumaker.mk
75		75
		76	.IF $(COM)=="GCC"
		77	CFLAGS+=-fexceptions -fno-enforce-eh-specs
		78	.ELSE
76	CFLAGS+=/GR /GX	79	CFLAGS+=/GR /GX
		80	.ENDIF
77		81
78	# --- Files --------------------------------------------------------	82	# --- Files --------------------------------------------------------
79		83

Lines 77-83 Link Here

(-)oo_1.1.1_src/sysui/source/win32/filepicker/makefile.mk.orig (+4 lines)
77		77
78	.INCLUDE : ..$/..$/cppumaker.mk	78	.INCLUDE : ..$/..$/cppumaker.mk
79		79
		80	.IF $(COM)=="GCC"
		81	CFLAGS+=-fexceptions -fno-enforce-eh-specs -D_WIN32_WINNT=0x0500
		82	.ELSE
80	CFLAGS+=/GX /GR /D_WIN32_WINNT=0x0500	83	CFLAGS+=/GX /GR /D_WIN32_WINNT=0x0500
		84	.ENDIF
81		85
82	# --- Resources ----------------------------------------------------	86	# --- Resources ----------------------------------------------------
83		87




APP1OBJS=$(OBJFILES)
APP1NOSAL=TRUE
APP1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
APP1STDLIBS=-luuid
.ELSE
APP1STDLIBS=comsupp.lib
.ENDIF

APP1STDLIBS+=$(SHELL32LIB)\
			$(OLE32LIB)\
			$(GDI32LIB)\
			$(OLEAUT32LIB)\
			$(COMDLG32LIB)

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





APP1OBJS=$(OBJFILES)
APP1NOSAL=TRUE
APP1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
APP1STDLIBS=-luuid
.ELSE
APP1STDLIBS=comsupp.lib
.ENDIF

APP1STDLIBS+=$(SHELL32LIB)\
			$(OLE32LIB)\
			$(GDI32LIB)\
			$(OLEAUT32LIB)\
			$(COMDLG32LIB)

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


Lines 207-217 Link Here

(-)oo_1.1.1_src/tools/util/makefile.mk.orig (-5 / +5 lines)
207		207
208		208
209	.IF "$(GUI)"=="WNT"	209	.IF "$(GUI)"=="WNT"
210	SHL1STDLIBS+= shell32.lib \	210	SHL1STDLIBS+= $(SHELL32LIB) \
211	mpr.lib \	211	$(MPRLIB) \
212	ole32.lib \	212	$(OLE32LIB) \
213	uuid.lib \	213	$(UUIDLIB) \
214	advapi32.lib	214	$(ADVAPI32IB)
215	.ENDIF	215	.ENDIF
216		216
217	DEF1NAME =$(SHL1TARGET)	217	DEF1NAME =$(SHL1TARGET)

Lines 86-93 Link Here

(-)oo_1.1.1_src/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

Lines 135-141 Link Here

(-)oo_1.1.1_src/ucb/source/ucp/webdav/makefile.mk.orig (-1 / +1 lines)
135	$(EXPATASCII3RDLIB)	135	$(EXPATASCII3RDLIB)
136		136
137	.IF "$(GUI)"=="WNT"	137	.IF "$(GUI)"=="WNT"
138	SHL1STDLIBS+= wsock32.lib	138	SHL1STDLIBS+= $(WSOCK32LIB)
139	.ENDIF # WNT	139	.ENDIF # WNT
140	.IF "$(OS)"=="SOLARIS"	140	.IF "$(OS)"=="SOLARIS"
141	SHL1STDLIBS+= -lnsl -lsocket	141	SHL1STDLIBS+= -lnsl -lsocket

Lines 76-86 Link Here

(-)oo_1.1.1_src/unzip/util/makefile.mk.orig (+7 lines)
76	HXX1EXCL= -E:include	76	HXX1EXCL= -E:include
77		77
78	LIB2TARGET= $(SLB)$/svunzip.lib	78	LIB2TARGET= $(SLB)$/svunzip.lib
		79	.IF "$(GUI)$(COM)"=="WNTGCC"
		80	LIB2ARCHIV=$(SLB)$/libsvunzip.a
		81	.ELSE
79	LIB2ARCHIV=$(LB)$/libsvunzip.a	82	LIB2ARCHIV=$(LB)$/libsvunzip.a
		83	.ENDIF
80	LIB2FILES= \	84	LIB2FILES= \
81	$(SLB)$/unzip.lib	85	$(SLB)$/unzip.lib
82		86
83	LIB1TARGET= $(LB)$/svunzip.lib	87	LIB1TARGET= $(LB)$/svunzip.lib
		88	.IF "$(GUI)$(COM)"=="WNTGCC"
		89	LIB1ARCHIV=$(LB)$/libsvunzip.a
		90	.ENDIF
84	LIB1FILES= \	91	LIB1FILES= \
85	$(LB)$/unzip.lib	92	$(LB)$/unzip.lib
86		93





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

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


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

SHL1STDLIBS += $(UWINAPILIB)      \
               $(GDI32LIB)        \
               $(WINSPOOLLIB)     \
               $(OLE32LIB)        \
               $(SHELL32LIB)      \
               $(ADVAPI32LIB)     \
               $(PSPLIB)          \
               $(IMM32LIB)

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




SHL1IMPLIB=i$(TARGET)

.IF "$(GUI)"=="WNT"
SHL1STDLIBS=$(WSOCK32LIB) $(SALLIB)
.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 92-98 Link Here

(-)oo_1.1.1_src/xml2cmp/source/finder/makefile.mk.orig (-1 / +1 lines)
92		92
93	.IF "$(GUI)"=="WNT"	93	.IF "$(GUI)"=="WNT"
94	UWINAPILIB=$(0)	94	UWINAPILIB=$(0)
95	APP1STDLIBS= MSVCIRT.LIB	95	#APP1STDLIBS= MSVCIRT.LIB
96	.ENDIF	96	.ENDIF
97		97
98		98

Lines 81-87 Link Here

(-)oo_1.1.1_src/xml2cmp/util/makefile.mk.orig (-1 / +1 lines)
81	APP1STACK= 1000000	81	APP1STACK= 1000000
82		82
83	.IF "$(GUI)"=="WNT"	83	.IF "$(GUI)"=="WNT"
84	APP1STDLIBS= MSVCIRT.LIB	84	#APP1STDLIBS= MSVCIRT.LIB
85	.ENDIF	85	.ENDIF
86		86
87		87




CFLAGS+=-GR
.ENDIF

.IF "$(SABLOT3RDLIB)"==""
.IF "$(GUI)"=="UNX"
SABLOT3RDLIB=-lsablot
.ENDIF # unx
.IF "$(GUI)"=="WNT"
SABLOT3RDLIB=sablot.lib
.ENDIF # wnt
.ENDIF # sablot3rdlib

# --- Shared-Library ---------------------------------------------------

SHL1TARGET=$(TARGET)$(UCP_VERSION)

SHL1STDLIBS=                     \
	$(CPPUHELPERLIB)         \
	$(CPPULIB)               \
	$(SABLOT3RDLIB)          \
	$(SALLIB)                \
	$(VOSLIB)                \
	$(SABLOT3RDLIB)          \
	$(EXPATASCII3RDLIB)      \
	$(UCBHELPERLIB)          \
	$(BERKELEYLIB)           \

Lines 73-80 Link Here

(-)oo_1.1.1_src/xmlhelp/source/cxxhelp/util/makefile.mk.orig (+2 lines)
73	.INCLUDE : settings.mk	73	.INCLUDE : settings.mk
74		74
75	.IF "$(GUI)"=="WNT"	75	.IF "$(GUI)"=="WNT"
		76	.IF "$(COM)"!="GCC"
76	CFLAGS+=-GR	77	CFLAGS+=-GR
77	.ENDIF	78	.ENDIF
		79	.ENDIF
78		80
79	SLOFILES=\	81	SLOFILES=\
80	$(SLO)$/Decompressor.obj \	82	$(SLO)$/Decompressor.obj \

Lines 75-82 Link Here

(-)oo_1.1.1_src/xmlhelp/source/cxxhelp/test/makefile.mk.orig (+2 lines)
75		75
76		76
77	.IF "$(GUI)"=="WNT"	77	.IF "$(GUI)"=="WNT"
		78	.IF "$(COM)"!="GCC"
78	CFLAGS+=-GR	79	CFLAGS+=-GR
79	.ENDIF	80	.ENDIF
		81	.ENDIF
80		82
81	# --- Files ---	83	# --- Files ---
82		84

Lines 73-80 Link Here

(-)oo_1.1.1_src/xmlhelp/source/cxxhelp/qe/makefile.mk.orig (+2 lines)
73	.INCLUDE : settings.mk	73	.INCLUDE : settings.mk
74		74
75	.IF "$(GUI)"=="WNT"	75	.IF "$(GUI)"=="WNT"
		76	.IF "$(COM)"!="GCC"
76	CFLAGS+=-GR	77	CFLAGS+=-GR
77	.ENDIF	78	.ENDIF
		79	.ENDIF
78		80
79	SLOFILES=\	81	SLOFILES=\
80	$(SLO)$/ConceptData.obj \	82	$(SLO)$/ConceptData.obj \

Lines 76-83 Link Here

(-)oo_1.1.1_src/xmlhelp/source/cxxhelp/provider/makefile.mk.orig (+2 lines)
76	CFLAGS += -DHAVE_EXPAT_H	76	CFLAGS += -DHAVE_EXPAT_H
77		77
78	.IF "$(GUI)"=="WNT"	78	.IF "$(GUI)"=="WNT"
		79	.IF "$(COM)"!="GCC"
79	CFLAGS+=-GR	80	CFLAGS+=-GR
80	.ENDIF	81	.ENDIF
		82	.ENDIF
81		83
82	# --- General -----------------------------------------------------	84	# --- General -----------------------------------------------------
83		85

Lines 72-82 Link Here

(-)oo_1.1.1_src/xmlhelp/source/cxxhelp/db/makefile.mk.orig (-2 / +3 lines)
72		72
73	.INCLUDE : settings.mk	73	.INCLUDE : settings.mk
74		74
		75	.IF "$(COM)"=="GCC"
		76	CFLAGSCXX+=-frtti
		77	.ELSE
75	.IF "$(GUI)"=="WNT"	78	.IF "$(GUI)"=="WNT"
76	CFLAGS+=-GR	79	CFLAGS+=-GR
77	.ENDIF	80	.ENDIF
78	.IF "$(COM)"=="GCC"
79	CFLAGSCXX+=-frtti
80	.ENDIF	81	.ENDIF
81		82
82	# --- Files --------------------------------------------------------	83	# --- Files --------------------------------------------------------

Return to issue 24588

Lines 103-111 Link Here

(-)oo_1.1.1_src/automation/util/makefile.mk.orig (-5 / +7 lines)
103		103
104	.IF "$(GUI)"=="WNT"	104	.IF "$(GUI)"=="WNT"
105	SHL1STDLIBS+=$(LIBCIMT) \	105	SHL1STDLIBS+=$(LIBCIMT) \
106	$(LIBPRE) app.lib \	106	$(APP3RDLIB) \
107	$(LIBPRE) advapi32.lib \	107	$(ADVAPI32LIB) \
108	$(LIBPRE) gdi32.lib	108	$(GDI32LIB)
109	.ENDIF	109	.ENDIF
110		110
111	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	111	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
Lines 126-133 Link Here
126	APP1STDLIBS= -lapp -lsample	126	APP1STDLIBS= -lapp -lsample
127	.ELSE	127	.ELSE
128	APP1STDLIBS= \	128	APP1STDLIBS= \
129	app.lib \	129	$(APP3RDLIB) \
130	sample.lib	130	$(SAMPLE3RDLIB)
131	.ENDIF	131	.ENDIF
132		132
133	APP1STDLIBS+= \	133	APP1STDLIBS+= \
Lines 223-230 Link Here
223		223
224	.IF "$(GUI)" != "UNX"	224	.IF "$(GUI)" != "UNX"
225	# win16 braucht ein appobj	225	# win16 braucht ein appobj
		226	.IF "$(COM)"!="GCC"
226	APP3OBJS= $(OBJ)$/testapp.obj	227	APP3OBJS= $(OBJ)$/testapp.obj
227	.ENDIF	228	.ENDIF
		229	.ENDIF
228		230
229	# --- Targets -----------------------------------------------------------	231	# --- Targets -----------------------------------------------------------
230		232

Lines 102-107 Link Here

(-)oo_1.1.1_src/berkeleydb/makefile.mk.orig (+17 lines)
102	.ENDIF # "$(GUI)"=="UNX"	102	.ENDIF # "$(GUI)"=="UNX"
103		103
104	.IF "$(GUI)"=="WNT"	104	.IF "$(GUI)"=="WNT"
		105	.IF "$(COM)"=="GCC"
		106	CONFIGURE_DIR=out
		107	#relative to CONFIGURE_DIR
		108	CONFIGURE_ACTION=/bin/sh -c 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LDFLAGS="-no-unde""fined $(SOLARLIB)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" ..$/dist$/configure --host=x86-pc-mingw32 --enable-cxx --enable-java --enable-dynamic --enable-shared'
		109	#CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
		110
		111	BUILD_DIR=$(CONFIGURE_DIR)
		112	BUILD_ACTION=make
		113
		114	OUT2BIN=java$/classes$/db.jar \
		115	$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
		116
		117
		118	OUT2LIB= \
		119	$(BUILD_DIR)$/.libs$/libdb*.a
		120	.ELSE
105	# make use of stlport headerfiles	121	# make use of stlport headerfiles
106	EXT_USE_STLPORT=TRUE	122	EXT_USE_STLPORT=TRUE
107		123
Lines 127-132 Link Here
127	$(BUILD_DIR)$/Release$/libdb_java32.lib \	143	$(BUILD_DIR)$/Release$/libdb_java32.lib \
128	$(BUILD_DIR)$/Release$/libdb32.lib	144	$(BUILD_DIR)$/Release$/libdb32.lib
129		145
		146	.ENDIF
130	.ENDIF # "$(GUI)"=="WNT"	147	.ENDIF # "$(GUI)"=="WNT"
131		148
132	OUT2INC= \	149	OUT2INC= \

Lines 92-97 Link Here

(-)oo_1.1.1_src/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 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS=-D_MT LIBS="-lws2_32 -lwinmm -lmingwthrd" .$/configure --host=x86-pc-mingw32 --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict'
		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 182-188 Link Here

(-)oo_1.1.1_src/desktop/util/makefile.mk.orig (-3 / +3 lines)
182	APP2DEPN= $(APP2RES) verinfo.rc	182	APP2DEPN= $(APP2RES) verinfo.rc
183	APP2NOSAL=TRUE	183	APP2NOSAL=TRUE
184	APP2TARGET=sowrapper	184	APP2TARGET=sowrapper
185	APP2STDLIBS+=shell32.lib	185	APP2STDLIBS+=$(SHELL32LIB)
186	APP2OBJS= $(OBJ)$/sowrapper.obj \	186	APP2OBJS= $(OBJ)$/sowrapper.obj \
187	$(OBJ)$/wrapperw.obj \	187	$(OBJ)$/wrapperw.obj \
188	$(OBJ)$/wrappera.obj	188	$(OBJ)$/wrappera.obj
Lines 195-201 Link Here
195	APP3DEPN= $(APP3RES) verinfo.rc	195	APP3DEPN= $(APP3RES) verinfo.rc
196	APP3NOSAL=TRUE	196	APP3NOSAL=TRUE
197	APP3TARGET=solocal	197	APP3TARGET=solocal
198	APP3STDLIBS+=shell32.lib	198	APP3STDLIBS+=$(SHELL32LIB)
199	APP3OBJS= \	199	APP3OBJS= \
200	$(OBJ)$/sowrapper.obj \	200	$(OBJ)$/sowrapper.obj \
201	$(OBJ)$/lwrapw.obj \	201	$(OBJ)$/lwrapw.obj \
Lines 208-214 Link Here
208	APP4DEPN= $(APP4RES) verinfo.rc	208	APP4DEPN= $(APP4RES) verinfo.rc
209	APP4NOSAL=TRUE	209	APP4NOSAL=TRUE
210	APP4TARGET=soremote	210	APP4TARGET=soremote
211	APP4STDLIBS+=shell32.lib	211	APP4STDLIBS+=$(SHELL32LIB)
212	APP4OBJS= \	212	APP4OBJS= \
213	$(OBJ)$/sowrapper.obj \	213	$(OBJ)$/sowrapper.obj \
214	$(OBJ)$/rwrapw.obj \	214	$(OBJ)$/rwrapw.obj \

Lines 87-93 Link Here

(-)oo_1.1.1_src/dtrans/util/makefile.mk.orig (-18 / +34 lines)
87		87
88	.IF "$(GUI)"=="WNT"	88	.IF "$(GUI)"=="WNT"
89	SHL1STDLIBS+= \	89	SHL1STDLIBS+= \
90	uwinapi.lib	90	$(UWINAPILIB)
91	.ENDIF	91	.ENDIF
92		92
93		93
Lines 115-124 Link Here
115	$(SALLIB) \	115	$(SALLIB) \
116	$(CPPULIB) \	116	$(CPPULIB) \
117	$(CPPUHELPERLIB)\	117	$(CPPUHELPERLIB)\
118	uwinapi.lib\	118	$(UWINAPILIB)\
119	advapi32.lib\	119	$(ADVAPILIB)\
120	ole32.lib\	120	$(OLE32LIB)\
121	gdi32.lib	121	$(GDI32LIB)
122		122
123	SHL2IMPLIB=i$(SHL2TARGET)	123	SHL2IMPLIB=i$(SHL2TARGET)
124		124
Lines 136-152 Link Here
136	$(SLB)$/dtobjfact.lib\	136	$(SLB)$/dtobjfact.lib\
137	$(SLB)$/mtaolecb.lib	137	$(SLB)$/mtaolecb.lib
138		138
		139	SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj
		140
		141	.IF "$(COM)"=="GCC"
		142	SHL3STDLIBS= \
		143	-luuid
		144	.ELSE
139	SHL3STDLIBS= \	145	SHL3STDLIBS= \
		146	comsupp.lib
		147	.ENDIF
		148
		149	SHL3STDLIBS+= \
140	$(SALLIB) \	150	$(SALLIB) \
141	$(CPPULIB) \	151	$(CPPULIB) \
142	$(CPPUHELPERLIB)\	152	$(CPPUHELPERLIB)\
143	uwinapi.lib\	153	$(UWINAPILIB)\
144	advapi32.lib\	154	$(ADVAPI32LIB)\
145	ole32.lib\	155	$(OLE32LIB)\
146	comsupp.lib\	156	$(OLEAUT32LIB)\
147	oleaut32.lib\	157	$(GDI32LIB)
148	gdi32.lib	158
149
150	SHL3IMPLIB=i$(SHL3TARGET)	159	SHL3IMPLIB=i$(SHL3TARGET)
151		160
152	SHL3DEF= $(MISC)$/$(SHL3TARGET).def	161	SHL3DEF= $(MISC)$/$(SHL3TARGET).def
Lines 163-178 Link Here
163	$(SLB)$/dtobjfact.lib\	172	$(SLB)$/dtobjfact.lib\
164	$(SLB)$/dtutils.lib	173	$(SLB)$/dtutils.lib
165		174
		175	.IF "$(COM)"=="GCC"
		176	SHL4STDLIBS= \
		177	-luuid
		178	.ELSE
166	SHL4STDLIBS= \	179	SHL4STDLIBS= \
		180	comsupp.lib
		181	.ENDIF
		182
		183	SHL4STDLIBS+= \
167	$(SALLIB) \	184	$(SALLIB) \
168	$(CPPULIB) \	185	$(CPPULIB) \
169	$(CPPUHELPERLIB) \	186	$(CPPUHELPERLIB) \
170	uwinapi.lib\	187	$(UWINAPILIB)\
171	advapi32.lib\	188	$(ADVAPI32LIB)\
172	ole32.lib\	189	$(OLE32LIB)\
173	comsupp.lib\	190	$(OLEAUT32LIB)\
174	oleaut32.lib\	191	$(GDI32LIB)
175	gdi32.lib
176		192
177	SHL4DEPN=	193	SHL4DEPN=
178	SHL4IMPLIB=i$(SHL4TARGET)	194	SHL4IMPLIB=i$(SHL4TARGET)

Lines 93-99 Link Here

(-)oo_1.1.1_src/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 145-151 Link Here

(-)oo_1.1.1_src/extensions/source/ole/makefile.mk.orig (-1 / +15 lines)
145		145
146		146
147	.IF "$(GUI)"=="WNT"	147	.IF "$(GUI)"=="WNT"
148		148	.IF "$(COM)"!="GCC"
149		149
150		150
151		151
Lines 162-167 Link Here
162		162
163		163
164	SHL1TARGET=$(TARGET)	164	SHL1TARGET=$(TARGET)
		165	.IF "$(COM)"=="GCC"
		166	SHL1STDLIBS=\
		167	$(SALLIB) \
		168	$(VOSLIB) \
		169	$(CPPULIB) \
		170	$(CPPUHELPERLIB) \
		171	$(LIBCIMT) \
		172	-lole32 \
		173	-luuid \
		174	-ladvapi32 \
		175	-loleaut32
		176	.ELSE
165	SHL1STDLIBS=\	177	SHL1STDLIBS=\
166	$(SALLIB) \	178	$(SALLIB) \
167	$(VOSLIB) \	179	$(VOSLIB) \
Lines 172-175 Link Here
172	uuid.lib \	184	uuid.lib \
173	advapi32.lib \	185	advapi32.lib \
174	oleaut32.lib	186	oleaut32.lib
		187	.ENDIF
175		188
Lines 187-192 Link Here
187	DEF1EXPORTFILE=$(SHL1TARGET).dxp	200	DEF1EXPORTFILE=$(SHL1TARGET).dxp
188		201
189	.ENDIF	202	.ENDIF
		203	.ENDIF
190		204
191	#----------------------------------------------------------------	205	#----------------------------------------------------------------
192		206

Line 0 Link Here

(-)oo_1.1.1_src/external/unicows/makefile.mk.orig (+17 lines)
	1	PRJ=..
	2	PRJNAME=3rdparty
	3	TARGET=unicows
	4
	5	.INCLUDE : settings.mk
	6
	7	.IF "$(GUI)$(COM)"=="WNTGCC"
	8	ALL: $(LB)$/libunicows.a
	9
	10	$(LB)$/libunicows.a:
	11	echo EXPORTS > $(MISC)$/unicows.def
	12	guw.pl reimp -s $(PSDK_HOME)$/lib$/unicows.lib \| sed -e 's:^_::' >> $(MISC)$/unicows.def
	13	dlltool --dllname unicows.dll --input-def=$(MISC)$/unicows.def --kill-at --output-lib=$(LB)$/libunicows.a
	14
	15	.ENDIF
	16
	17	.INCLUDE : target.mk

Line 0 Link Here

(-)oo_1.1.1_src/external/dbghelp/makefile.mk.orig (+16 lines)
	1	PRJ=..
	2	PRJNAME=3rdparty
	3	TARGET=dbghelp
	4
	5	.INCLUDE : settings.mk
	6
	7	.IF "$(GUI)$(COM)"=="WNTGCC"
	8	ALL: $(LB)$/libdbghelp.a
	9
	10	$(LB)$/libdbghelp.a:
	11	echo EXPORTS > $(MISC)$/dbghelp.def
	12	guw.pl reimp -s $(PSDK_HOME)$/lib$/dbghelp.lib \| sed -e 's:^_::' >> $(MISC)$/dbghelp.def
	13	dlltool --dllname dbghelp.dll --input-def=$(MISC)$/dbghelp.def --kill-at --output-lib=$(LB)$/libdbghelp.a
	14	.ENDIF
	15
	16	.INCLUDE : target.mk

Lines 84-99 Link Here

(-)oo_1.1.1_src/fpicker/util/makefile.mk.orig (-17 / +21 lines)
84	$(SALLIB)\	84	$(SALLIB)\
85	$(VCLLIB)\	85	$(VCLLIB)\
86	$(TOOLSLIB)\	86	$(TOOLSLIB)\
87	uwinapi.lib \	87	$(UWINAPILIB) \
88	advapi32.lib \	88	$(ADVAPI32LIB) \
89	shell32.lib\	89	$(SHELL32LIB)\
90	ole32.lib\	90	$(OLE32LIB)\
91	gdi32.lib\	91	$(GDI32LIB)\
92	oleaut32.lib\	92	$(OLEAUT32LIB)\
93	comdlg32.lib\	93	$(COMDLG32LIB)
94	kernel32.lib\	94
95	comsupp.lib\	95	.IF "$(COM)"!="GCC"
96	oleaut32.lib	96	SHL2STDLIBS+=comsupp.lib
		97	.ENDIF
97		98
98	SHL1DEPN=	99	SHL1DEPN=
99	SHL1IMPLIB=i$(SHL1TARGET)	100	SHL1IMPLIB=i$(SHL1TARGET)
Lines 118-130 Link Here
118	$(SALLIB)\	119	$(SALLIB)\
119	$(TOOLSLIB)\	120	$(TOOLSLIB)\
120	$(VCLLIB)\	121	$(VCLLIB)\
121	uwinapi.lib \	122	$(UWINAPILIB) \
122	advapi32.lib \	123	$(ADVAPI32LIB) \
123	ole32.lib\	124	$(OLE32LIB)\
124	gdi32.lib\	125	$(GDI32LIB)\
125	shell32.lib\	126	$(SHELL32LIB)\
126	comsupp.lib\	127	$(OLEAUT32LIB)
127	oleaut32.lib	128
		129	.IF "$(COM)"!="GCC"
		130	SHL2STDLIBS+=comsupp.lib
		131	.ENDIF
128		132
129	SHL2DEPN=	133	SHL2DEPN=
130	SHL2IMPLIB=i$(SHL2TARGET)	134	SHL2IMPLIB=i$(SHL2TARGET)

Lines 127-132 Link Here

(-)oo_1.1.1_src/icu/makefile.mk.orig (+22 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 'CPP="$(WRAPCMD) -noshowcommand $(COMPATH)/bin/gcc -mno-cygwin -E" CFLAGS="-O -mthreads" CXXFLAGS="-O -mthreads" LIBS="-mthreads" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
		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 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 67-84 Link Here

(-)oo_1.1.1_src/lingucomponent/source/thesaurus/libth/makefile.mk.orig (-12 lines)
67	ENABLE_EXCEPTIONS=TRUE	67	ENABLE_EXCEPTIONS=TRUE
68	USE_DEFFILE=TRUE	68	USE_DEFFILE=TRUE
69		69
70
71	.IF "$(ULINGULIB)"==""
72	.IF "$(GUI)"=="UNX"
73	ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
74	.ENDIF # unx
75	.IF "$(GUI)"=="WNT"
76	ULINGULIB=$(LIBPRE) ulingu.lib
77	.ENDIF # wnt
78	.ENDIF
79
80
81
82	#----- Settings ---------------------------------------------------------	70	#----- Settings ---------------------------------------------------------
83		71
84	.INCLUDE : settings.mk	72	.INCLUDE : settings.mk

Lines 67-93 Link Here

(-)oo_1.1.1_src/lingucomponent/source/spellcheck/spell/makefile.mk.orig (-21 lines)
67	ENABLE_EXCEPTIONS=TRUE	67	ENABLE_EXCEPTIONS=TRUE
68	USE_DEFFILE=TRUE	68	USE_DEFFILE=TRUE
69		69
70	.IF "$(MYSPELLLIB)"==""
71	.IF "$(GUI)"=="UNX"
72	MYSPELLLIB=-lmyspell
73	.ENDIF # unx
74	.IF "$(GUI)"=="WNT"
75	MYSPELLLIB=libmyspell.lib
76	.ENDIF # wnt
77	.ENDIF
78
79	.IF "$(ULINGULIB)"==""
80	.IF "$(GUI)"=="UNX"
81	ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
82	.ENDIF # unx
83	.IF "$(GUI)"=="WNT"
84	ULINGULIB=$(LIBPRE) ulingu.lib
85	.ENDIF # wnt
86	.ENDIF
87
88
89
90
91	#----- Settings ---------------------------------------------------------	70	#----- Settings ---------------------------------------------------------
92		71
93	.INCLUDE : settings.mk	72	.INCLUDE : settings.mk

Lines 67-89 Link Here

(-)oo_1.1.1_src/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk.orig (-17 lines)
67	ENABLE_EXCEPTIONS=TRUE	67	ENABLE_EXCEPTIONS=TRUE
68	USE_DEFFILE=TRUE	68	USE_DEFFILE=TRUE
69		69
70	.IF "$(GUI)"=="UNX"
71	HNJLIB=-lhnj
72	.ELSE
73	HNJLIB=libhnj.lib
74	.ENDIF
75
76	.IF "$(ULINGULIB)"==""
77	.IF "$(GUI)"=="UNX"
78	ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
79	.ENDIF # unx
80	.IF "$(GUI)"=="WNT"
81	ULINGULIB=$(LIBPRE) ulingu.lib
82	.ENDIF # wnt
83	.ENDIF
84
85
86
87	#----- Settings ---------------------------------------------------------	70	#----- Settings ---------------------------------------------------------
88		71
89	.INCLUDE : settings.mk	72	.INCLUDE : settings.mk

Lines 126-131 Link Here

(-)oo_1.1.1_src/odk/pack/copying/makefile.mk.orig (+12 lines)
126	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)	126	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)
127		127
128	.IF "$(GUI)"=="WNT"	128	.IF "$(GUI)"=="WNT"
		129	.IF "$(COM)"=="GCC"
		130	LIBLIST = \
		131	$(DESTDIRLIB)$/libstore.a \
		132	$(DESTDIRLIB)$/libreg.a \
		133	$(DESTDIRLIB)$/libsal.a \
		134	$(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a \
		135	$(DESTDIRLIB)$/libcppu.a \
		136	$(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a \
		137	$(DESTDIRLIB)$/librmcxt.a \
		138	$(DESTDIRLIB)$/libstlport_gcc.a
		139	.ELSE
129	LIBLIST = \	140	LIBLIST = \
130	$(DESTDIRLIB)$/istore.lib \	141	$(DESTDIRLIB)$/istore.lib \
131	$(DESTDIRLIB)$/ireg.lib \	142	$(DESTDIRLIB)$/ireg.lib \
Lines 141-146 Link Here
141	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib	152	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
142	.ENDIF	153	.ENDIF
143	.ENDIF	154	.ENDIF
		155	.ENDIF
144		156
145	SETTINGSLIST= \	157	SETTINGSLIST= \
146	$(DESTDIRSETTINGS)$/settings.mk \	158	$(DESTDIRSETTINGS)$/settings.mk \

Lines 79-86 Link Here

(-)oo_1.1.1_src/psprint/util/makefile.mk.orig (+22 lines)
79	.ELSE # "$(GUIBASE)"=="aqua"	79	.ELSE # "$(GUIBASE)"=="aqua"
80		80
81	.IF "$(OS)"=="WNT"	81	.IF "$(OS)"=="WNT"
		82	.IF "$(COM)"=="GCC"
		83
		84	LIB1TARGET= $(SLB)$/$(TARGET).lib
		85	LIB1FILES= $(SLB)$/fontsubset.lib
		86
		87	SHL1TARGET= psp$(UPD)$(DLLPOSTFIX)
		88	SHL1IMPLIB= ipsp
		89	SHL1LIBS=$(LIB1FILES)
		90
		91	SHL1STDLIBS=$(SALLIB)
		92
		93	SHL1VERSIONMAP=libpsp_mingw.map
		94
		95	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
		96
		97	# --- Def-File ---
		98
		99	DEF1NAME= $(SHL1TARGET)
		100	DEF1DES=PSPrint
		101
		102	.ELSE
82	LIB1TARGET= $(SLB)$/a$(TARGET).lib	103	LIB1TARGET= $(SLB)$/a$(TARGET).lib
83	LIB1FILES= $(SLB)$/fontsubset.lib	104	LIB1FILES= $(SLB)$/fontsubset.lib
		105	.ENDIF
84	.ELSE	106	.ELSE
85		107
86	LIB1TARGET= $(SLB)$/$(TARGET).lib	108	LIB1TARGET= $(SLB)$/$(TARGET).lib

Lines 65-72 Link Here

(-)oo_1.1.1_src/pyuno/source/module/makefile.mk.orig (-5 / +1 lines)
65		65
66	# --- Settings -----------------------------------------------------	66	# --- Settings -----------------------------------------------------
67		67
68	.INCLUDE : settings.mk
69	.INCLUDE : pyversion.mk	68	.INCLUDE : pyversion.mk
		69	.INCLUDE : settings.mk
70	#-------------------------------------------------------------------	70	#-------------------------------------------------------------------
71		71
72	CFLAGS+=-I$(SOLARINCDIR)$/python	72	CFLAGS+=-I$(SOLARINCDIR)$/python
Lines 82-94 Link Here
82	# so this library cannot be checked	82	# so this library cannot be checked
83	SHL1NOCHECK=yes	83	SHL1NOCHECK=yes
84	PYUNORC=pyunorc	84	PYUNORC=pyunorc
85	.IF "$(OS)"=="SOLARIS" \|\| "$(OS)"=="MACOSX"
86	PYTHONLIB=-lpython
87	.ENDIF
88	.ELSE	85	.ELSE
89	# on windows, the python executable also uses the shared library,	86	# on windows, the python executable also uses the shared library,
90	# so we link pyuno directly to it	87	# so we link pyuno directly to it
91	PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
92	PYUNORC=pyuno.ini	88	PYUNORC=pyuno.ini
93	.ENDIF	89	.ENDIF
94		90

Lines 65-75 Link Here

(-)oo_1.1.1_src/pyuno/source/loader/makefile.mk.orig (-9 / +5 lines)
65		65
66	# --- Settings -----------------------------------------------------	66	# --- Settings -----------------------------------------------------
67		67
		68	.INCLUDE : pyversion.mk
68	.INCLUDE : settings.mk	69	.INCLUDE : settings.mk
69		70
70	DLLPRE =	71	DLLPRE =
71		72
72	.INCLUDE : pyversion.mk
73	#-------------------------------------------------------------------	73	#-------------------------------------------------------------------
74		74
75	CFLAGS+=-I$(SOLARINCDIR)$/python	75	CFLAGS+=-I$(SOLARINCDIR)$/python
Lines 79-92 Link Here
79	DIRECT = $(LINKFLAGSDEFS)	79	DIRECT = $(LINKFLAGSDEFS)
80	.ENDIF	80	.ENDIF
81		81
82	.IF "$(GUI)" == "UNX"
83	PYUNOLIB=-lpyuno
84	PYTHONLIB=-lpython
85	.ELSE
86	PYUNOLIB=ipyuno.lib
87	PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
88	.ENDIF
89
90	SHL1TARGET= $(TARGET)	82	SHL1TARGET= $(TARGET)
91		83
92	SHL1STDLIBS= \	84	SHL1STDLIBS= \
Lines 143-148 Link Here
143	.IF "$(OS)"=="MACOSX"	135	.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))"	136	+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	137	.ELSE
		138	.IF "$(GUI)$(COM)"=="WNTGCC"
		139	+cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
		140	.ELSE
146	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))	141	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
147	.ENDIF # $(OS)=="MACOSX"	142	.ENDIF # $(OS)=="MACOSX"
		143	.ENDIF # $(OS)=="MACOSX"
148	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb	144	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb

Lines 124-142 Link Here

(-)oo_1.1.1_src/sal/util/makefile.mk.orig (-12 / +10 lines)
124	SHL1VERSIONMAP= $(TARGET).map	124	SHL1VERSIONMAP= $(TARGET).map
125		125
126	.IF "$(GUI)"=="WNT"	126	.IF "$(GUI)"=="WNT"
127	.IF "$(COM)"!="GCC"
128	SHL1STDLIBS= \	127	SHL1STDLIBS= \
129	uwinapi.lib\	128	$(UWINAPILIB)\
130	advapi32.lib\	129	$(ADVAPI32LIB)\
131	wsock32.lib\	130	$(WSOCK32LIB)\
132	mpr.lib\	131	$(MPRLIB)\
133	shell32.lib\	132	$(SHELL32LIB)\
134	comdlg32.lib\	133	$(OLE32LIB)
135	user32.lib\
136	ole32.lib
137	.ELSE
138	SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32
139	.ENDIF # GCC
140	.ENDIF # WNT	134	.ENDIF # WNT
141		135
142	.IF "$(GUI)"=="MAC"	136	.IF "$(GUI)"=="MAC"
Lines 175-182 Link Here
175	SHL1OBJS= \	169	SHL1OBJS= \
176	$(OBJ)$/dllentry.obj	170	$(OBJ)$/dllentry.obj
177	.ELSE	171	.ELSE
		172	.IF "$(GUI)"!="WNT" \|\| "$(COM)"!="GCC"
178	SHL1OBJS= \	173	SHL1OBJS= \
179	$(SLO)$/dllentry.obj	174	$(SLO)$/dllentry.obj
		175	.ELSE
		176	SHL1OBJS=
		177	.ENDIF
180	.ENDIF # MAC	178	.ENDIF # MAC
181	.ENDIF # UNX	179	.ENDIF # UNX
182	.ENDIF # lincinc	180	.ENDIF # lincinc

Lines 130-138 Link Here

(-)oo_1.1.1_src/sal/systools/win32/uwinapi/makefile.mk.orig (-7 / +21 lines)
130	SHL1IMPLIB=$(SHL1TARGET)	130	SHL1IMPLIB=$(SHL1TARGET)
131	SHL1DEF=$(MISC)/$(SHL1TARGET).def	131	SHL1DEF=$(MISC)/$(SHL1TARGET).def
132	DEF1NAME=$(SHL1TARGET)	132	DEF1NAME=$(SHL1TARGET)
		133	.IF "$(COM)"=="GCC"
		134	DEF1EXPORTFILE=\
		135	$(SHL1TARGET)_mingw.dxp\
		136	unicows_mingw.dxp
		137	.ELSE
133	DEF1EXPORTFILE=\	138	DEF1EXPORTFILE=\
134	$(SHL1TARGET).dxp\	139	$(SHL1TARGET).dxp\
135	unicows.dxp	140	unicows.dxp
		141	.ENDIF
136	DEF1DEPN=\	142	DEF1DEPN=\
137	$(DEF1EXPORTFILE)\	143	$(DEF1EXPORTFILE)\
138	makefile.mk	144	makefile.mk
Lines 143-158 Link Here
143	#No default libraries	149	#No default libraries
144	STDSHL=	150	STDSHL=
145		151
		152	.IF "$(COM)"=="GCC"
146	SHL1STDLIBS=\	153	SHL1STDLIBS=\
147	unicows.lib\	154	-lmingw32 \
148	kernel32.lib\	155	-lgcc
149	user32.lib\	156	.ELSE
150	advapi32.lib\	157	SHL1STDLIBS=
151	version.lib\	158	.ENDIF
152	msvcrt.lib	159
		160	SHL1STDLIBS+=\
		161	$(UNICOWSLIB)\
		162	$(KERNEL32LIB)\
		163	$(USER32LIB)\
		164	$(ADVAPI32LIB)\
		165	$(VERSIONLIB)\
		166	$(MSVCRTLIB)
153		167
154
155	.ENDIF	168	.ENDIF
156		169
		170
157	.INCLUDE : target.mk	171	.INCLUDE : target.mk
158		172

Lines 149-156 Link Here

(-)oo_1.1.1_src/sc/util/makefile.mk.orig (+4 lines)
149	SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET)	149	SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET)
150		150
151	.IF "$(GUI)"!="UNX"	151	.IF "$(GUI)"!="UNX"
		152	.IF "$(COM)"!="GCC"
152	SHL1OBJS= $(SLO)$/scdll.obj	153	SHL1OBJS= $(SLO)$/scdll.obj
153	.ENDIF	154	.ENDIF
		155	.ENDIF
154		156
155	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	157	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
156		158
Lines 273-280 Link Here
273	@echo ------------------------------	275	@echo ------------------------------
274	@echo Making: $@	276	@echo Making: $@
275	@echo LIBRARY $(SHL1TARGET) >$@	277	@echo LIBRARY $(SHL1TARGET) >$@
		278	.IF "$(COM)"!="GCC"
276	@echo DESCRIPTION 'SCALC3 DLL' >>$@	279	@echo DESCRIPTION 'SCALC3 DLL' >>$@
277	@echo DATA READ WRITE NONSHARED >>$@	280	@echo DATA READ WRITE NONSHARED >>$@
		281	.ENDIF
278	@echo EXPORTS >>$@	282	@echo EXPORTS >>$@
279	@echo CreateScDocShellDll @20 >>$@	283	@echo CreateScDocShellDll @20 >>$@
280	@echo CreateObjScDocShellDll @21 >>$@	284	@echo CreateObjScDocShellDll @21 >>$@

Lines 92-99 Link Here

(-)oo_1.1.1_src/sc/addin/datefunc/makefile.mk.orig (-2 / +4 lines)
92	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	92	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
93		93
94	.IF "$(GUI)" == "WNT"	94	.IF "$(GUI)" == "WNT"
95	SHL1STDLIBS= gdi32.lib advapi32.lib comdlg32.lib \	95	SHL1STDLIBS= $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
96	uuid.lib ole32.lib shell32.lib winspool.lib	96	$(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
97	.IF "$(GVER)" == "W40"	97	.IF "$(GVER)" == "W40"
98	SHL1STDLIBS= $(SHL1STDLIBS) comctl32.lib	98	SHL1STDLIBS= $(SHL1STDLIBS) comctl32.lib
99	.ENDIF	99	.ENDIF
Lines 146-153 Link Here
146	@echo ------------------------------	146	@echo ------------------------------
147	@echo Making: $@	147	@echo Making: $@
148	@echo LIBRARY $(SHL1TARGET)>$@	148	@echo LIBRARY $(SHL1TARGET)>$@
		149	.IF "$(COM)"!="GCC"
149	@echo DESCRIPTION 'DateF StarCalc Addin DLL'>>$@	150	@echo DESCRIPTION 'DateF StarCalc Addin DLL'>>$@
150	@echo DATA READ WRITE NONSHARED>>$@	151	@echo DATA READ WRITE NONSHARED>>$@
		152	.ENDIF
151	@echo EXPORTS>>$@	153	@echo EXPORTS>>$@
152	@echo GetFunctionCount>>$@	154	@echo GetFunctionCount>>$@
153	@echo GetFunctionData>>$@	155	@echo GetFunctionData>>$@

Lines 115-126 Link Here

(-)oo_1.1.1_src/scptools/util/cui/makefile.mk.orig (-2 / +6 lines)
115	.IF "$(GUI)"=="UNX"	115	.IF "$(GUI)"=="UNX"
116	APP4STDLIBS = -lbtstrp	116	APP4STDLIBS = -lbtstrp
117	.ELSE	117	.ELSE
		118	.IF "$(COM)"=="GCC"
		119	APP4STDLIBS += -lbtstrp_static
		120	.ELSE
118	APP4STDLIBS = $(L)$/bootstrp.lib	121	APP4STDLIBS = $(L)$/bootstrp.lib
119	.ENDIF	122	.ENDIF
		123	.ENDIF
120	APP4STDLIBS += $(SALLIB) $(TOOLSLIB) $(SVTOOLLIB) $(SETUPLIB) $(VOSLIB)	124	APP4STDLIBS += $(SALLIB) $(TOOLSLIB) $(SVTOOLLIB) $(SETUPLIB) $(VOSLIB)
121		125
122	.IF "$(GUI)"=="WNT"	126	.IF "$(GUI)"=="WNT"
123	APP4STDLIBS += ws2_32.lib	127	APP4STDLIBS += $(WS2_32LIB)
124	.ENDIF	128	.ENDIF
125		129
126	APP4OBJS = $(OBJ)$/lzip.obj \	130	APP4OBJS = $(OBJ)$/lzip.obj \
Lines 135-141 Link Here
135	APP5STDLIBS += $(CPPULIB)	139	APP5STDLIBS += $(CPPULIB)
136	.ENDIF	140	.ENDIF
137	.IF "$(GUI)"=="WNT"	141	.IF "$(GUI)"=="WNT"
138	APP5STDLIBS += ws2_32.lib	142	APP5STDLIBS += $(WS2_32LIB)
139	.ENDIF	143	.ENDIF
140	APP5OBJS = $(OBJ)$/websnooper.obj	144	APP5OBJS = $(OBJ)$/websnooper.obj
141		145

Lines 143-156 Link Here

(-)oo_1.1.1_src/setup2/util/makefile.mk.orig (-7 / +19 lines)
143	-lXext	143	-lXext
144	.ENDIF # "$(OS)"!="MACOSX"	144	.ENDIF # "$(OS)"!="MACOSX"
145	.ELSE # "$(GUI)"=="UNX"	145	.ELSE # "$(GUI)"=="UNX"
		146	.IF "$(COM)"!="GCC"
146	SHL1OBJS = $(SLO)$/agenda.obj	147	SHL1OBJS = $(SLO)$/agenda.obj
		148	.ENDIF
147	SHL1STDLIBS+= $(SVUNZIPDLL)	149	SHL1STDLIBS+= $(SVUNZIPDLL)
148	.ENDIF # "$(GUI)"=="UNX"	150	.ENDIF # "$(GUI)"=="UNX"
149		151
150	.IF "$(GUI)"=="WNT"	152	.IF "$(GUI)"=="WNT"
151	SHL1STDLIBS += \	153	SHL1STDLIBS += \
152	uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \	154	$(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
153	winmm.lib	155	$(WINMMLIB)
154	.ENDIF # "$(GUI)"=="WNT"	156	.ENDIF # "$(GUI)"=="WNT"
155		157
156	DEF1NAME =$(SHL1TARGET)	158	DEF1NAME =$(SHL1TARGET)
Lines 200-207 Link Here
200	.ENDIF	202	.ENDIF
201		203
202	.IF "$(GUI)"=="WNT"	204	.IF "$(GUI)"=="WNT"
203	APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \	205	.IF "$(COM)"=="GCC"
204	winmm.lib	206	APP2DEPN+= $(LB)$/libset$(UPD)$(DLLPOSTFIX).a
		207	APP2STDLIBS += -lset$(UPD)$(DLLPOSTFIX)
		208	.ENDIF
		209	APP2STDLIBS += $(UWINAPILIB) $(ADVAPI32LIB) $(GDI32LIB) $(SHELL32LIB) $(OLE32LIB) $(UUIDLIB) $(VERSIONLIB) \
		210	$(WINMMLIB)
205	.ENDIF # "$(GUI)"=="WNT"	211	.ENDIF # "$(GUI)"=="WNT"
206		212
207	.IF "$(GUI)"=="UNX"	213	.IF "$(GUI)"=="UNX"
Lines 237-248 Link Here
237	makefile.mk	243	makefile.mk
238		244
239	.IF "$(GUI)" != "UNX"	245	.IF "$(GUI)" != "UNX"
		246	.IF "$(GUI)$(COM)" != "WNTGCC"
240	APP2OBJS+=\	247	APP2OBJS+=\
241	$(OBJ)$/main.obj \	248	$(OBJ)$/main.obj \
242	$(OBJ)$/mainwnd.obj \	249	$(OBJ)$/mainwnd.obj \
243	$(OBJ)$/mainevt.obj \	250	$(OBJ)$/mainevt.obj \
244	$(OBJ)$/magenda.obj \	251	$(OBJ)$/magenda.obj \
245	$(OBJ)$/textani.obj	252	$(OBJ)$/textani.obj
		253	.ENDIF
246	.ENDIF # "$(GUI)" != "UNX"	254	.ENDIF # "$(GUI)" != "UNX"
247		255
248	APP2DEF= $(MISCX)$/$(TARGET).def	256	APP2DEF= $(MISCX)$/$(TARGET).def
Lines 265-271 Link Here
265	APP3TARGET=loader	273	APP3TARGET=loader
266		274
267	.IF "$(GUI)"=="WNT"	275	.IF "$(GUI)"=="WNT"
268	APP3STDLIBS=svunzip.lib gdi32.lib advapi32.lib libcmt.lib shell32.lib	276	APP3STDLIBS=$(SVUNZIPLIB)
		277	.IF "$(COM)"!="GCC"
		278	APP3STDLIBS+=libcmt.lib
		279	.ENDIF
		280	APP3STDLIBS+=$(GDI32LIB) $(ADVAPI32LIB) $(SHELL32LIB)
269	.ENDIF	281	.ENDIF
270		282
271	.IF "$(GUI)"=="WNT"	283	.IF "$(GUI)"=="WNT"
Lines 375-383 Link Here
375	.IF "$(USE_SHELL)" != "4nt"	387	.IF "$(USE_SHELL)" != "4nt"
376	DOLLAR_SIGN=\$$	388	DOLLAR_SIGN=\$$
377	REGCOMP_ENV=\	389	REGCOMP_ENV=\
378	setenv CLASSPATH "$(strip $(subst,\,/ $(shell guw.pl echo $(REGCOMP_CLASSPATH))))" && \	390	setenv CLASSPATH "$(strip $(subst,\,/ $(shell $(WRAPCMD) echo $(REGCOMP_CLASSPATH))))" && \
379	setenv PATH "$(PATH):$(JREPATH)"	391	setenv PATH "$(PATH):$(JREPATH)"
380	MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell guw.pl echo $(SOLARBINDIR))))	392	MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR))))
381	.ELSE # "$(USE_SHELL)" != "4nt"	393	.ELSE # "$(USE_SHELL)" != "4nt"
382	DOLLAR_SIGN=$$	394	DOLLAR_SIGN=$$
383	REGCOMP_ENV=\	395	REGCOMP_ENV=\

Lines 36-57 Link Here

(-)oo_1.1.1_src/setup2/source/custom/update/makefile.mk.orig (-11 / +5 lines)
36		36
37	CFLAGS += -DHAVE_EXPAT_H	37	CFLAGS += -DHAVE_EXPAT_H
38		38
		39	.IF "$(COM)"=="GCC"
		40	CFLAGSCXX+=-frtti
		41	.ELSE
39	.IF "$(GUI)"=="WNT"	42	.IF "$(GUI)"=="WNT"
40	CFLAGS+=-GR	43	CFLAGS+=-GR
41	.ENDIF	44	.ENDIF
42	.IF "$(COM)"=="GCC"
43	CFLAGSCXX+=-frtti
44	.ENDIF	45	.ENDIF
45		46
46	.IF "$(SABLOT3RDLIB)"==""
47	.IF "$(GUI)"=="UNX"
48	SABLOT3RDLIB=-lsablot
49	.ENDIF # unx
50	.IF "$(GUI)"=="WNT"
51	SABLOT3RDLIB=sablot.lib
52	.ENDIF # wnt
53	.ENDIF # sablot3rdlib
54
55	.IF "$(OS)"=="MAC"	47	.IF "$(OS)"=="MAC"
56	SHL1STDLIBS= \	48	SHL1STDLIBS= \
57	$(TOOLSLIB) \	49	$(TOOLSLIB) \
Lines 64-69 Link Here
64	$(TOOLSLIB) \	56	$(TOOLSLIB) \
65	$(SALLIB) \	57	$(SALLIB) \
66	$(SABLOT3RDLIB) \	58	$(SABLOT3RDLIB) \
		59	$(TOOLSLIB) \
		60	$(SALLIB) \
67	$(EXPATASCII3RDLIB) \	61	$(EXPATASCII3RDLIB) \
68	$(SETUPLIB)	62	$(SETUPLIB)
69	.ENDIF	63	.ENDIF

Lines 88-102 Link Here

(-)oo_1.1.1_src/setup2/source/custom/sample/makefile.mk.orig (-4 / +8 lines)
88		88
89	SHL1TARGET= $(TARGET)$(VERSION)$(DLLPOSTFIX)	89	SHL1TARGET= $(TARGET)$(VERSION)$(DLLPOSTFIX)
90	SHL1IMPLIB= i$(TARGET)	90	SHL1IMPLIB= i$(TARGET)
91	SHL1LIBS= $(LIB1TARGET)	91	SHL1LIBS= $(LIB1TARGET) \
		92	$(SLB)$/sicustom.lib
		93	.IF "$(COM)"!="GCC"
92	SHL1OBJS= $(SLO)$/sample.obj	94	SHL1OBJS= $(SLO)$/sample.obj
		95	.ENDIF
93	SHL1DEPN= $(L)$/itools.lib $(SVLIBDEPEND)	96	SHL1DEPN= $(L)$/itools.lib $(SVLIBDEPEND)
94	SHL1STDLIBS=\	97	SHL1STDLIBS=\
95	$(SALLIB) \	98	$(SALLIB) \
96	$(SVLIB) \	99	$(SVLIB) \
97	itools.lib \	100	$(TOOLSLIB) \
98	svmem.lib \	101	$(SVMEMLIB)
99	$(SLB)$/sicustom.lib
100		102
101	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	103	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
102		104
Lines 112-119 Link Here
112	@echo ------------------------------	114	@echo ------------------------------
113	@echo Making: $@	115	@echo Making: $@
114	@echo LIBRARY $(TARGET)$(VERSION)$(DLLPOSTFIX) >$@	116	@echo LIBRARY $(TARGET)$(VERSION)$(DLLPOSTFIX) >$@
		117	.IF "$(COM)"!="GCC"
115	@echo CODE PRELOAD MOVEABLE DISCARDABLE >>$@	118	@echo CODE PRELOAD MOVEABLE DISCARDABLE >>$@
116	@echo DATA PRELOAD SINGLE >>$@	119	@echo DATA PRELOAD SINGLE >>$@
		120	.ENDIF
117	@echo EXPORTS >>$@	121	@echo EXPORTS >>$@
118	.IF "$(GUI)"=="WIN"	122	.IF "$(GUI)"=="WIN"
119	@echo _CustomInit >>$@	123	@echo _CustomInit >>$@

Lines 78-84 Link Here

(-)oo_1.1.1_src/setup2/source/custom/deinst/makefile.mk.orig (-1 / +3 lines)
78		78
79		79
80	.IF "$(GUI)"=="WNT"	80	.IF "$(GUI)"=="WNT"
81	SHL1STDLIBS+= advapi32.lib	81	SHL1STDLIBS+= $(ADVAPI32LIB)
82	.ENDIF	82	.ENDIF
83	SHL1LIBS = $(SLB)$/$(TARGET).lib $(SLB)$/sicustom.lib	83	SHL1LIBS = $(SLB)$/$(TARGET).lib $(SLB)$/sicustom.lib
84		84
Lines 99-106 Link Here
99	@echo -------------------------------------------	99	@echo -------------------------------------------
100	@echo DEF-File erstellen	100	@echo DEF-File erstellen
101	@echo LIBRARY $(DLLNAME) >$@	101	@echo LIBRARY $(DLLNAME) >$@
		102	.IF "$(COM)"!="GCC"
102	@echo DESCRIPTION 'DEL DLL' >>$@	103	@echo DESCRIPTION 'DEL DLL' >>$@
103	@echo DATA READ WRITE NONSHARED >>$@	104	@echo DATA READ WRITE NONSHARED >>$@
		105	.ENDIF
104	@echo EXPORTS >>$@	106	@echo EXPORTS >>$@
105	.IF "$(GUI)"=="WIN"	107	.IF "$(GUI)"=="WIN"
106	@echo _CustomInit >>$@	108	@echo _CustomInit >>$@

Lines 133-144 Link Here

(-)oo_1.1.1_src/sfx2/util/makefile.mk.orig (-6 / +6 lines)
133	.IF "$(GUI)"=="WNT"	133	.IF "$(GUI)"=="WNT"
134		134
135	SHL1STDLIBS+=\	135	SHL1STDLIBS+=\
136	uwinapi.lib \	136	$(UWINAPILIB) \
137	advapi32.lib \	137	$(ADVAPI32LIB) \
138	shell32.lib \	138	$(SHELL32LIB) \
139	gdi32.lib \	139	$(GDI32LIB) \
140	ole32.lib \	140	$(OLE32LIB) \
141	uuid.lib	141	$(UUIDLIB)
142		142
143	.ENDIF # WNT	143	.ENDIF # WNT
144		144

Lines 115-132 Link Here

(-)oo_1.1.1_src/shell/source/win32/shlxthandler/makefile.mk.orig (-12 / +24 lines)
115		115
116	SHL1TARGET=$(TARGET)	116	SHL1TARGET=$(TARGET)
117		117
118	SHL1STDLIBS=uwinapi.lib\	118	.IF "$(COM)"=="GCC"
119	oleaut32.lib\	119	SHL1STDLIBS=-luwinapi\
120	advapi32.lib\	120	-loleaut32\
121	ole32.lib\	121	-ladvapi32\
122	uuid.lib\	122	-lole32\
123	shell32.lib\	123	-luuid\
124	comctl32.lib\	124	-lshell32\
125	gdi32.lib	125	-lcomctl32\
		126	-lgdi32\
		127	$(STATIC) -lzlib_static\
		128	-lexpat_xmlparse_static\
		129	-lexpat_xmltok_static $(DYNAMIC)
		130	.ELSE
		131	SHL1STDLIBS=$(ZLIB3RDLIB)\
		132	$(EXPAT3RDLIB)\
		133	$(UWINAPILIB)\
		134	$(OLEAUT32LIB)\
		135	$(ADVAPI32LIB)\
		136	$(OLE32LIB)\
		137	$(UUIDLIB)\
		138	$(SHELL32LIB)\
		139	$(COMCTL32LIB)\
		140	$(GDI32LIB)
126		141
127	SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\	142	.ENDIF
128	$(SOLARLIBDIR)$/expat_xmlparse.lib\
129	$(SOLARLIBDIR)$/expat_xmltok.lib
130		143
131	SHL1DEPN=	144	SHL1DEPN=
132		145
Lines 141-147 Link Here
141	OBJFILES=$(OBJ)$/regsvrex.obj	154	OBJFILES=$(OBJ)$/regsvrex.obj
142	APP1TARGET=$(TARGET1)	155	APP1TARGET=$(TARGET1)
143	APP1OBJS=$(OBJFILES)	156	APP1OBJS=$(OBJFILES)
144	APP1STDLIBS=kernel32.lib
145	APP1DEF=$(MISC)$/$(APP1TARGET).def	157	APP1DEF=$(MISC)$/$(APP1TARGET).def
146		158
147	# --- Targets ------------------------------------------------------	159	# --- Targets ------------------------------------------------------

Lines 122-128 Link Here

(-)oo_1.1.1_src/so3/util/makefile.mk.orig (-2 / +4 lines)
122		122
123	.IF "$(GUI)"=="WNT"	123	.IF "$(GUI)"=="WNT"
124	SHL1STDLIBS+= \	124	SHL1STDLIBS+= \
125	ole32.lib uuid.lib advapi32.lib gdi32.lib	125	$(OLE32LIB) $(UUIDLIB) $(ADVAPI32LIB) $(GDI32LIB)
126	.ENDIF	126	.ENDIF
127		127
128	.IF "$(GUI)"=="WIN"	128	.IF "$(GUI)"=="WIN"
Lines 135-141 Link Here
135	SHL1STDLIBS+=$(SJLIB)	135	SHL1STDLIBS+=$(SJLIB)
136	.ENDIF	136	.ENDIF
137		137
138	.IF "$(GUI)"=="UNX"	138	.IF "$(GUI)"=="UNX"\|\|"$(GUI)$(COM)"=="WNTGCC"
139	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)	139	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)
140	.ELSE	140	.ELSE
141	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)	141	SHL1DEPN= $(L)$/itools.lib $(LIB1TARGET)
Lines 143-152 Link Here
143		143
144	.IF "$(linkinc)" == ""	144	.IF "$(linkinc)" == ""
145	.IF "$(GUI)"=="WNT"	145	.IF "$(GUI)"=="WNT"
		146	.IF "$(COM)"!="GCC"
146	SHL1OBJS+= $(SLO)$/so2dll.obj \	147	SHL1OBJS+= $(SLO)$/so2dll.obj \
147	$(SHLOBJECTS)	148	$(SHLOBJECTS)
148		149
149	.ENDIF	150	.ENDIF
		151	.ENDIF
150	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	152	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
151		153
152	.ELSE #"$(linkinc)" == ""	154	.ELSE #"$(linkinc)" == ""