Attachment #14460 for issue #24588

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

Lines 73-82 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_slo.mk.orig (+12 lines)
73	@echo Making: $@	73	@echo Making: $@
74	# @+$(RM) $@	74	# @+$(RM) $@
75	.IF "$(GUI)"=="WNT"	75	.IF "$(GUI)"=="WNT"
		76	.IF "$(COM)"=="GCC"
		77	+$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i)) \| xargs -n1 > $@
		78	.ELSE
76	.IF "$(LIBTARGET)"!="NO"	79	.IF "$(LIBTARGET)"!="NO"
77	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	80	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
78	.ENDIF # "$(LIBTARGET)"!="NO"	81	.ENDIF # "$(LIBTARGET)"!="NO"
79	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))	82	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
		83	.ENDIF
80	.ENDIF # "$(GUI)"=="WNT"	84	.ENDIF # "$(GUI)"=="WNT"
81	.IF "$(GUI)"=="UNX"	85	.IF "$(GUI)"=="UNX"
82	+echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@	86	+echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@
Lines 101-110 Link Here
101	@echo ------------------------------	105	@echo ------------------------------
102	@echo Making: $@	106	@echo Making: $@
103	.IF "$(GUI)"=="WNT"	107	.IF "$(GUI)"=="WNT"
		108	.IF "$(COM)"=="GCC"
		109	+$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTSLOFILES:f) $(RSLO)$/$(i)) \| xargs -n1 > $@
		110	.ELSE
104	.IF "$(LIBTARGET)"!="NO"	111	.IF "$(LIBTARGET)"!="NO"
105	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	112	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
106	.ENDIF # "$(LIBTARGET)"!="NO"	113	.ENDIF # "$(LIBTARGET)"!="NO"
107	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))	114	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
		115	.ENDIF
108	.ENDIF # "$(GUI)"=="WNT"	116	.ENDIF # "$(GUI)"=="WNT"
109	.IF "$(GUI)"=="UNX"	117	.IF "$(GUI)"=="UNX"
110	+echo $(foreach,i,$(REAL_SVXLIGHTSLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@	118	+echo $(foreach,i,$(REAL_SVXLIGHTSLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@
Lines 122-131 Link Here
122	@echo ------------------------------	130	@echo ------------------------------
123	@echo Making: $@	131	@echo Making: $@
124	.IF "$(GUI)"=="WNT"	132	.IF "$(GUI)"=="WNT"
		133	.IF "$(COM)"=="GCC"
		134	+$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i)) \| xargs -n1 > $@
		135	.ELSE
125	.IF "$(LIBTARGET)"!="NO"	136	.IF "$(LIBTARGET)"!="NO"
126	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	137	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
127	.ENDIF # "$(LIBTARGET)"!="NO"	138	.ENDIF # "$(LIBTARGET)"!="NO"
128	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))	139	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
		140	.ENDIF
129	.ENDIF # "$(GUI)"=="WNT"	141	.ENDIF # "$(GUI)"=="WNT"
130	.IF "$(GUI)"=="UNX"	142	.IF "$(GUI)"=="UNX"
131	+echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@	143	+echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) \| xargs -n1 > $@

Lines 68-76 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_obj.mk.orig (-5 / +3 lines)
68	@echo Making: $@	68	@echo Making: $@
69	.IF "$(GUI)"=="WNT"	69	.IF "$(GUI)"=="WNT"
70	.IF "$(COM)"=="GCC"	70	.IF "$(COM)"=="GCC"
71	+$(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) >> $@	71	+$(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@
72	@+$(TYPE) $@ \| tr -d ï\n\rï > $@
73	@+$(ECHONL) >> $@
74	.ELSE # "$(COM)"=="GCC"	72	.ELSE # "$(COM)"=="GCC"
75	.IF "$(LIBTARGET)"!="NO"	73	.IF "$(LIBTARGET)"!="NO"
76	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	74	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
Lines 97-103 Link Here
97	.IF "$(GUI)"=="WNT"	95	.IF "$(GUI)"=="WNT"
98	.IF "$(COM)"=="GCC"	96	.IF "$(COM)"=="GCC"
99	# $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)	97	# $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
100	+$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) >> $@	98	+$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) \| xargs -n1 > $@
101	.ELSE	99	.ELSE
102	.IF "$(LIBTARGET)"!="NO"	100	.IF "$(LIBTARGET)"!="NO"
103	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	101	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
Lines 119-125 Link Here
119	.IF "$(GUI)"=="WNT"	117	.IF "$(GUI)"=="WNT"
120	.IF "$(COM)"=="GCC"	118	.IF "$(COM)"=="GCC"
121	# $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)	119	# $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
122	+$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@	120	+$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) >> $@
123	.ELSE	121	.ELSE
124	.IF "$(LIBTARGET)"!="NO"	122	.IF "$(LIBTARGET)"!="NO"
125	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)	123	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)

Lines 118-126 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_lib.mk.orig (-1 / +14 lines)
118	@+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd	118	@+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
119	.ENDIF	119	.ENDIF
120	@cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd	120	@cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
121	@source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd	121	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
122	.ELSE # "$(GUI)"=="UNX"	122	.ELSE # "$(GUI)"=="UNX"
		123	.IF "$(GUI)$(COM)"=="WNTGCC"
		124	@+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
		125	@+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
		126	@+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
		127	@cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
		128	@+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
		129	.ELSE
123	@echo just a dummy > $@	130	@echo just a dummy > $@
		131	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
124	.ENDIF # "$(GUI)"=="UNX"	132	.ENDIF # "$(GUI)"=="UNX"
125		133
126	.ENDIF # "$(LIB$(TNR)ARCHIV)" != ""	134	.ENDIF # "$(LIB$(TNR)ARCHIV)" != ""
Lines 149-154 Link Here
149	@+cat /dev/null $(LIB$(TNR)FILES) \| xargs -n 1 >> $@	157	@+cat /dev/null $(LIB$(TNR)FILES) \| xargs -n 1 >> $@
150	.ELSE # "$(GUI)"=="MAC"	158	.ELSE # "$(GUI)"=="MAC"
151	.IF "$(GUI)"=="WNT"	159	.IF "$(GUI)"=="WNT"
		160	.IF "$(COM)"=="GCC"
		161	+$(ECHONL) $(LIB$(TNR)OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		162	@+cat /dev/null $(LIB$(TNR)FILES) \| xargs -n1 >> $@
		163	.ELSE
152	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))	164	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
153	@+-$(RM) $(@:s/.lib/.lin/)	165	@+-$(RM) $(@:s/.lib/.lin/)
154	.IF "$(LIB$(TNR)OBJFILES)"!=""	166	.IF "$(LIB$(TNR)OBJFILES)"!=""
Lines 158-163 Link Here
158	@-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	170	@-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
159	.ENDIF # "$(LIB$(TNR)FILES)"!=""	171	.ENDIF # "$(LIB$(TNR)FILES)"!=""
160	@+$(ECHONL)	172	@+$(ECHONL)
		173	.ENDIF
161	.ELSE # "$(GUI)"=="WNT"	174	.ELSE # "$(GUI)"=="WNT"
162	@+-$(RM) $@	175	@+-$(RM) $@
163	+echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)	176	+echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)

Lines 172-180 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_def.mk.orig (+12 lines)
172	@echo ------------------------------	172	@echo ------------------------------
173	@echo Making Module-Definitionfile : $@	173	@echo Making Module-Definitionfile : $@
174	@echo LIBRARY $(SHL$(TNR)TARGET) >$@	174	@echo LIBRARY $(SHL$(TNR)TARGET) >$@
		175	.IF "$(COM)"!="GCC"
175	@echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@	176	@echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@
176	@echo DATA READ WRITE SHARED >>$@	177	@echo DATA READ WRITE SHARED >>$@
177	@echo HEAPSIZE 0 >>$@	178	@echo HEAPSIZE 0 >>$@
		179	.ENDIF
178	@echo EXPORTS >>$@	180	@echo EXPORTS >>$@
179	# getversioninfo fuer alle!!	181	# getversioninfo fuer alle!!
180	@echo GetVersionInfo >>$@	182	@echo GetVersionInfo >>$@
Lines 182-187 Link Here
182	@echo component_getDescriptionFunc >>$@	184	@echo component_getDescriptionFunc >>$@
183	.ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"==""	185	.ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"==""
184	.IF "$(DEFLIB$(TNR)NAME)"!=""	186	.IF "$(DEFLIB$(TNR)NAME)"!=""
		187	.IF "$(COM)"=="GCC"
		188	dlltool --output-def $(SHL$(TNR)TARGET).exp --export-all-symbols \
		189	`$(TYPE) $(SLB)$/$(DEFLIB$(TNR)NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		190	tail --lines +3 $(SHL$(TNR)TARGET).exp >>$@
		191	.ELSE
185	@+$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib	192	@+$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib
186	.IF "$(USE_LDUMP2)"=!""	193	.IF "$(USE_LDUMP2)"=!""
187	.IF "$(DEF$(TNR)CEXP)"!=""	194	.IF "$(DEF$(TNR)CEXP)"!=""
Lines 192-197 Link Here
192	.ELSE # "$(USE_LDUMP2)"=!""	199	.ELSE # "$(USE_LDUMP2)"=!""
193	@+$(EXPORT$(TNR)_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@	200	@+$(EXPORT$(TNR)_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@
194	.ENDIF # "$(USE_LDUMP2)"=!""	201	.ENDIF # "$(USE_LDUMP2)"=!""
		202	.ENDIF
195	+$(EXPORT$(TNR)_PROTECT) $(RM) $(SHL$(TNR)TARGET).exp	203	+$(EXPORT$(TNR)_PROTECT) $(RM) $(SHL$(TNR)TARGET).exp
196	# now *\defs\$(OUTPATH) exists, commit it	204	# now *\defs\$(OUTPATH) exists, commit it
197	.IF "$(BUILD_SOSL)"==""	205	.IF "$(BUILD_SOSL)"==""
Lines 267-274 Link Here
267	@echo $(DEF$(TNR)EXPORT20) >>$@	275	@echo $(DEF$(TNR)EXPORT20) >>$@
268	.ENDIF	276	.ENDIF
269	.IF "$(DEF$(TNR)EXPORTFILE)"!=""	277	.IF "$(DEF$(TNR)EXPORTFILE)"!=""
		278	.IF "$(COM)"=="GCC"
		279	+$(TYPE) $(DEF$(TNR)EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		280	.ELSE
270	+$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@	281	+$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@
271	.ENDIF	282	.ENDIF
		283	.ENDIF
272	.ENDIF # "$(APP$(TNR)HEAP)"==""	284	.ENDIF # "$(APP$(TNR)HEAP)"==""
273	.ENDIF # "$(GUI)"=="WNT"	285	.ENDIF # "$(GUI)"=="WNT"
274		286

Lines 24-30 Link Here

(-)oo_1.1.1_src/solenv/inc/_tg_lib.mk.orig (-9 / +139 lines)
24	@cat $(MISC)$/$(LIB1ARCHIV:b).cmd	24	@cat $(MISC)$/$(LIB1ARCHIV:b).cmd
25	@source $(MISC)$/$(LIB1ARCHIV:b).cmd	25	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
26	.ELSE # "$(GUI)"=="UNX"	26	.ELSE # "$(GUI)"=="UNX"
		27	.IF "$(GUI)$(COM)"=="WNTGCC"
		28	@+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
		29	@+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) \| sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
		30	@+echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
		31	@cat $(MISC)$/$(LIB1ARCHIV:b).cmd
		32	@+source $(MISC)$/$(LIB1ARCHIV:b).cmd
		33	.ELSE
27	@echo just a dummy > $@	34	@echo just a dummy > $@
		35	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
28	.ENDIF # "$(GUI)"=="UNX"	36	.ENDIF # "$(GUI)"=="UNX"
29		37
30	.ENDIF # "$(LIB1ARCHIV)" != ""	38	.ENDIF # "$(LIB1ARCHIV)" != ""
Lines 53-58 Link Here
53	@+cat /dev/null $(LIB1FILES) \| xargs -n 1 >> $@	61	@+cat /dev/null $(LIB1FILES) \| xargs -n 1 >> $@
54	.ELSE # "$(GUI)"=="MAC"	62	.ELSE # "$(GUI)"=="MAC"
55	.IF "$(GUI)"=="WNT"	63	.IF "$(GUI)"=="WNT"
		64	.IF "$(COM)"=="GCC"
		65	+$(ECHONL) $(LIB1OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		66	@+cat /dev/null $(LIB1FILES) \| xargs -n1 >> $@
		67	.ELSE
56	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))	68	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
57	@+-$(RM) $(@:s/.lib/.lin/)	69	@+-$(RM) $(@:s/.lib/.lin/)
58	.IF "$(LIB1OBJFILES)"!=""	70	.IF "$(LIB1OBJFILES)"!=""
Lines 62-67 Link Here
62	@-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	74	@-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
63	.ENDIF # "$(LIB1FILES)"!=""	75	.ENDIF # "$(LIB1FILES)"!=""
64	@+$(ECHONL)	76	@+$(ECHONL)
		77	.ENDIF
65	.ELSE # "$(GUI)"=="WNT"	78	.ELSE # "$(GUI)"=="WNT"
66	@+-$(RM) $@	79	@+-$(RM) $@
67	+echo $(LIBMGR) r $@ $(LIB1OBJFILES)	80	+echo $(LIBMGR) r $@ $(LIB1OBJFILES)
Lines 96-104 Link Here
96	@+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd	109	@+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
97	.ENDIF	110	.ENDIF
98	@cat $(MISC)$/$(LIB2ARCHIV:b).cmd	111	@cat $(MISC)$/$(LIB2ARCHIV:b).cmd
99	@source $(MISC)$/$(LIB2ARCHIV:b).cmd	112	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
100	.ELSE # "$(GUI)"=="UNX"	113	.ELSE # "$(GUI)"=="UNX"
		114	.IF "$(GUI)$(COM)"=="WNTGCC"
		115	@+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
		116	@+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
		117	@+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
		118	@cat $(MISC)$/$(LIB2ARCHIV:b).cmd
		119	@+source $(MISC)$/$(LIB2ARCHIV:b).cmd
		120	.ELSE
101	@echo just a dummy > $@	121	@echo just a dummy > $@
		122	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
102	.ENDIF # "$(GUI)"=="UNX"	123	.ENDIF # "$(GUI)"=="UNX"
103		124
104	.ENDIF # "$(LIB2ARCHIV)" != ""	125	.ENDIF # "$(LIB2ARCHIV)" != ""
Lines 127-132 Link Here
127	@+cat /dev/null $(LIB2FILES) \| xargs -n 1 >> $@	148	@+cat /dev/null $(LIB2FILES) \| xargs -n 1 >> $@
128	.ELSE # "$(GUI)"=="MAC"	149	.ELSE # "$(GUI)"=="MAC"
129	.IF "$(GUI)"=="WNT"	150	.IF "$(GUI)"=="WNT"
		151	.IF "$(COM)"=="GCC"
		152	+$(ECHONL) $(LIB2OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		153	@+cat /dev/null $(LIB2FILES) \| xargs -n1 >> $@
		154	.ELSE
130	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))	155	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
131	@+-$(RM) $(@:s/.lib/.lin/)	156	@+-$(RM) $(@:s/.lib/.lin/)
132	.IF "$(LIB2OBJFILES)"!=""	157	.IF "$(LIB2OBJFILES)"!=""
Lines 136-141 Link Here
136	@-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	161	@-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
137	.ENDIF # "$(LIB2FILES)"!=""	162	.ENDIF # "$(LIB2FILES)"!=""
138	@+$(ECHONL)	163	@+$(ECHONL)
		164	.ENDIF
139	.ELSE # "$(GUI)"=="WNT"	165	.ELSE # "$(GUI)"=="WNT"
140	@+-$(RM) $@	166	@+-$(RM) $@
141	+echo $(LIBMGR) r $@ $(LIB2OBJFILES)	167	+echo $(LIBMGR) r $@ $(LIB2OBJFILES)
Lines 170-178 Link Here
170	@+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd	196	@+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
171	.ENDIF	197	.ENDIF
172	@cat $(MISC)$/$(LIB3ARCHIV:b).cmd	198	@cat $(MISC)$/$(LIB3ARCHIV:b).cmd
173	@source $(MISC)$/$(LIB3ARCHIV:b).cmd	199	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
174	.ELSE # "$(GUI)"=="UNX"	200	.ELSE # "$(GUI)"=="UNX"
		201	.IF "$(GUI)$(COM)"=="WNTGCC"
		202	@+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
		203	@+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
		204	@+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
		205	@cat $(MISC)$/$(LIB3ARCHIV:b).cmd
		206	@+source $(MISC)$/$(LIB3ARCHIV:b).cmd
		207	.ELSE
175	@echo just a dummy > $@	208	@echo just a dummy > $@
		209	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
176	.ENDIF # "$(GUI)"=="UNX"	210	.ENDIF # "$(GUI)"=="UNX"
177		211
178	.ENDIF # "$(LIB3ARCHIV)" != ""	212	.ENDIF # "$(LIB3ARCHIV)" != ""
Lines 201-206 Link Here
201	@+cat /dev/null $(LIB3FILES) \| xargs -n 1 >> $@	235	@+cat /dev/null $(LIB3FILES) \| xargs -n 1 >> $@
202	.ELSE # "$(GUI)"=="MAC"	236	.ELSE # "$(GUI)"=="MAC"
203	.IF "$(GUI)"=="WNT"	237	.IF "$(GUI)"=="WNT"
		238	.IF "$(COM)"=="GCC"
		239	+$(ECHONL) $(LIB3OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		240	@+cat /dev/null $(LIB3FILES) \| xargs -n1 >> $@
		241	.ELSE
204	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))	242	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
205	@+-$(RM) $(@:s/.lib/.lin/)	243	@+-$(RM) $(@:s/.lib/.lin/)
206	.IF "$(LIB3OBJFILES)"!=""	244	.IF "$(LIB3OBJFILES)"!=""
Lines 210-215 Link Here
210	@-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	248	@-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
211	.ENDIF # "$(LIB3FILES)"!=""	249	.ENDIF # "$(LIB3FILES)"!=""
212	@+$(ECHONL)	250	@+$(ECHONL)
		251	.ENDIF
213	.ELSE # "$(GUI)"=="WNT"	252	.ELSE # "$(GUI)"=="WNT"
214	@+-$(RM) $@	253	@+-$(RM) $@
215	+echo $(LIBMGR) r $@ $(LIB3OBJFILES)	254	+echo $(LIBMGR) r $@ $(LIB3OBJFILES)
Lines 244-252 Link Here
244	@+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd	283	@+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
245	.ENDIF	284	.ENDIF
246	@cat $(MISC)$/$(LIB4ARCHIV:b).cmd	285	@cat $(MISC)$/$(LIB4ARCHIV:b).cmd
247	@source $(MISC)$/$(LIB4ARCHIV:b).cmd	286	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
248	.ELSE # "$(GUI)"=="UNX"	287	.ELSE # "$(GUI)"=="UNX"
		288	.IF "$(GUI)$(COM)"=="WNTGCC"
		289	@+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
		290	@+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
		291	@+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
		292	@cat $(MISC)$/$(LIB4ARCHIV:b).cmd
		293	@+source $(MISC)$/$(LIB4ARCHIV:b).cmd
		294	.ELSE
249	@echo just a dummy > $@	295	@echo just a dummy > $@
		296	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
250	.ENDIF # "$(GUI)"=="UNX"	297	.ENDIF # "$(GUI)"=="UNX"
251		298
252	.ENDIF # "$(LIB4ARCHIV)" != ""	299	.ENDIF # "$(LIB4ARCHIV)" != ""
Lines 275-280 Link Here
275	@+cat /dev/null $(LIB4FILES) \| xargs -n 1 >> $@	322	@+cat /dev/null $(LIB4FILES) \| xargs -n 1 >> $@
276	.ELSE # "$(GUI)"=="MAC"	323	.ELSE # "$(GUI)"=="MAC"
277	.IF "$(GUI)"=="WNT"	324	.IF "$(GUI)"=="WNT"
		325	.IF "$(COM)"=="GCC"
		326	+$(ECHONL) $(LIB4OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		327	@+cat /dev/null $(LIB4FILES) \| xargs -n1 >> $@
		328	.ELSE
278	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))	329	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
279	@+-$(RM) $(@:s/.lib/.lin/)	330	@+-$(RM) $(@:s/.lib/.lin/)
280	.IF "$(LIB4OBJFILES)"!=""	331	.IF "$(LIB4OBJFILES)"!=""
Lines 284-289 Link Here
284	@-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	335	@-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
285	.ENDIF # "$(LIB4FILES)"!=""	336	.ENDIF # "$(LIB4FILES)"!=""
286	@+$(ECHONL)	337	@+$(ECHONL)
		338	.ENDIF
287	.ELSE # "$(GUI)"=="WNT"	339	.ELSE # "$(GUI)"=="WNT"
288	@+-$(RM) $@	340	@+-$(RM) $@
289	+echo $(LIBMGR) r $@ $(LIB4OBJFILES)	341	+echo $(LIBMGR) r $@ $(LIB4OBJFILES)
Lines 318-326 Link Here
318	@+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd	370	@+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
319	.ENDIF	371	.ENDIF
320	@cat $(MISC)$/$(LIB5ARCHIV:b).cmd	372	@cat $(MISC)$/$(LIB5ARCHIV:b).cmd
321	@source $(MISC)$/$(LIB5ARCHIV:b).cmd	373	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
322	.ELSE # "$(GUI)"=="UNX"	374	.ELSE # "$(GUI)"=="UNX"
		375	.IF "$(GUI)$(COM)"=="WNTGCC"
		376	@+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
		377	@+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
		378	@+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
		379	@cat $(MISC)$/$(LIB5ARCHIV:b).cmd
		380	@+source $(MISC)$/$(LIB5ARCHIV:b).cmd
		381	.ELSE
323	@echo just a dummy > $@	382	@echo just a dummy > $@
		383	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
324	.ENDIF # "$(GUI)"=="UNX"	384	.ENDIF # "$(GUI)"=="UNX"
325		385
326	.ENDIF # "$(LIB5ARCHIV)" != ""	386	.ENDIF # "$(LIB5ARCHIV)" != ""
Lines 349-354 Link Here
349	@+cat /dev/null $(LIB5FILES) \| xargs -n 1 >> $@	409	@+cat /dev/null $(LIB5FILES) \| xargs -n 1 >> $@
350	.ELSE # "$(GUI)"=="MAC"	410	.ELSE # "$(GUI)"=="MAC"
351	.IF "$(GUI)"=="WNT"	411	.IF "$(GUI)"=="WNT"
		412	.IF "$(COM)"=="GCC"
		413	+$(ECHONL) $(LIB5OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		414	@+cat /dev/null $(LIB5FILES) \| xargs -n1 >> $@
		415	.ELSE
352	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))	416	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
353	@+-$(RM) $(@:s/.lib/.lin/)	417	@+-$(RM) $(@:s/.lib/.lin/)
354	.IF "$(LIB5OBJFILES)"!=""	418	.IF "$(LIB5OBJFILES)"!=""
Lines 358-363 Link Here
358	@-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	422	@-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
359	.ENDIF # "$(LIB5FILES)"!=""	423	.ENDIF # "$(LIB5FILES)"!=""
360	@+$(ECHONL)	424	@+$(ECHONL)
		425	.ENDIF
361	.ELSE # "$(GUI)"=="WNT"	426	.ELSE # "$(GUI)"=="WNT"
362	@+-$(RM) $@	427	@+-$(RM) $@
363	+echo $(LIBMGR) r $@ $(LIB5OBJFILES)	428	+echo $(LIBMGR) r $@ $(LIB5OBJFILES)
Lines 392-400 Link Here
392	@+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd	457	@+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
393	.ENDIF	458	.ENDIF
394	@cat $(MISC)$/$(LIB6ARCHIV:b).cmd	459	@cat $(MISC)$/$(LIB6ARCHIV:b).cmd
395	@source $(MISC)$/$(LIB6ARCHIV:b).cmd	460	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
396	.ELSE # "$(GUI)"=="UNX"	461	.ELSE # "$(GUI)"=="UNX"
		462	.IF "$(GUI)$(COM)"=="WNTGCC"
		463	@+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
		464	@+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
		465	@+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
		466	@cat $(MISC)$/$(LIB6ARCHIV:b).cmd
		467	@+source $(MISC)$/$(LIB6ARCHIV:b).cmd
		468	.ELSE
397	@echo just a dummy > $@	469	@echo just a dummy > $@
		470	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
398	.ENDIF # "$(GUI)"=="UNX"	471	.ENDIF # "$(GUI)"=="UNX"
399		472
400	.ENDIF # "$(LIB6ARCHIV)" != ""	473	.ENDIF # "$(LIB6ARCHIV)" != ""
Lines 423-428 Link Here
423	@+cat /dev/null $(LIB6FILES) \| xargs -n 1 >> $@	496	@+cat /dev/null $(LIB6FILES) \| xargs -n 1 >> $@
424	.ELSE # "$(GUI)"=="MAC"	497	.ELSE # "$(GUI)"=="MAC"
425	.IF "$(GUI)"=="WNT"	498	.IF "$(GUI)"=="WNT"
		499	.IF "$(COM)"=="GCC"
		500	+$(ECHONL) $(LIB6OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		501	@+cat /dev/null $(LIB6FILES) \| xargs -n1 >> $@
		502	.ELSE
426	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))	503	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
427	@+-$(RM) $(@:s/.lib/.lin/)	504	@+-$(RM) $(@:s/.lib/.lin/)
428	.IF "$(LIB6OBJFILES)"!=""	505	.IF "$(LIB6OBJFILES)"!=""
Lines 432-437 Link Here
432	@-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	509	@-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
433	.ENDIF # "$(LIB6FILES)"!=""	510	.ENDIF # "$(LIB6FILES)"!=""
434	@+$(ECHONL)	511	@+$(ECHONL)
		512	.ENDIF
435	.ELSE # "$(GUI)"=="WNT"	513	.ELSE # "$(GUI)"=="WNT"
436	@+-$(RM) $@	514	@+-$(RM) $@
437	+echo $(LIBMGR) r $@ $(LIB6OBJFILES)	515	+echo $(LIBMGR) r $@ $(LIB6OBJFILES)
Lines 466-474 Link Here
466	@+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd	544	@+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
467	.ENDIF	545	.ENDIF
468	@cat $(MISC)$/$(LIB7ARCHIV:b).cmd	546	@cat $(MISC)$/$(LIB7ARCHIV:b).cmd
469	@source $(MISC)$/$(LIB7ARCHIV:b).cmd	547	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
470	.ELSE # "$(GUI)"=="UNX"	548	.ELSE # "$(GUI)"=="UNX"
		549	.IF "$(GUI)$(COM)"=="WNTGCC"
		550	@+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
		551	@+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
		552	@+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
		553	@cat $(MISC)$/$(LIB7ARCHIV:b).cmd
		554	@+source $(MISC)$/$(LIB7ARCHIV:b).cmd
		555	.ELSE
471	@echo just a dummy > $@	556	@echo just a dummy > $@
		557	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
472	.ENDIF # "$(GUI)"=="UNX"	558	.ENDIF # "$(GUI)"=="UNX"
473		559
474	.ENDIF # "$(LIB7ARCHIV)" != ""	560	.ENDIF # "$(LIB7ARCHIV)" != ""
Lines 497-502 Link Here
497	@+cat /dev/null $(LIB7FILES) \| xargs -n 1 >> $@	583	@+cat /dev/null $(LIB7FILES) \| xargs -n 1 >> $@
498	.ELSE # "$(GUI)"=="MAC"	584	.ELSE # "$(GUI)"=="MAC"
499	.IF "$(GUI)"=="WNT"	585	.IF "$(GUI)"=="WNT"
		586	.IF "$(COM)"=="GCC"
		587	+$(ECHONL) $(LIB7OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		588	@+cat /dev/null $(LIB7FILES) \| xargs -n1 >> $@
		589	.ELSE
500	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))	590	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
501	@+-$(RM) $(@:s/.lib/.lin/)	591	@+-$(RM) $(@:s/.lib/.lin/)
502	.IF "$(LIB7OBJFILES)"!=""	592	.IF "$(LIB7OBJFILES)"!=""
Lines 506-511 Link Here
506	@-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	596	@-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
507	.ENDIF # "$(LIB7FILES)"!=""	597	.ENDIF # "$(LIB7FILES)"!=""
508	@+$(ECHONL)	598	@+$(ECHONL)
		599	.ENDIF
509	.ELSE # "$(GUI)"=="WNT"	600	.ELSE # "$(GUI)"=="WNT"
510	@+-$(RM) $@	601	@+-$(RM) $@
511	+echo $(LIBMGR) r $@ $(LIB7OBJFILES)	602	+echo $(LIBMGR) r $@ $(LIB7OBJFILES)
Lines 540-548 Link Here
540	@+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd	631	@+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
541	.ENDIF	632	.ENDIF
542	@cat $(MISC)$/$(LIB8ARCHIV:b).cmd	633	@cat $(MISC)$/$(LIB8ARCHIV:b).cmd
543	@source $(MISC)$/$(LIB8ARCHIV:b).cmd	634	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
544	.ELSE # "$(GUI)"=="UNX"	635	.ELSE # "$(GUI)"=="UNX"
		636	.IF "$(GUI)$(COM)"=="WNTGCC"
		637	@+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
		638	@+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
		639	@+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
		640	@cat $(MISC)$/$(LIB8ARCHIV:b).cmd
		641	@+source $(MISC)$/$(LIB8ARCHIV:b).cmd
		642	.ELSE
545	@echo just a dummy > $@	643	@echo just a dummy > $@
		644	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
546	.ENDIF # "$(GUI)"=="UNX"	645	.ENDIF # "$(GUI)"=="UNX"
547		646
548	.ENDIF # "$(LIB8ARCHIV)" != ""	647	.ENDIF # "$(LIB8ARCHIV)" != ""
Lines 571-576 Link Here
571	@+cat /dev/null $(LIB8FILES) \| xargs -n 1 >> $@	670	@+cat /dev/null $(LIB8FILES) \| xargs -n 1 >> $@
572	.ELSE # "$(GUI)"=="MAC"	671	.ELSE # "$(GUI)"=="MAC"
573	.IF "$(GUI)"=="WNT"	672	.IF "$(GUI)"=="WNT"
		673	.IF "$(COM)"=="GCC"
		674	+$(ECHONL) $(LIB8OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		675	@+cat /dev/null $(LIB8FILES) \| xargs -n1 >> $@
		676	.ELSE
574	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))	677	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
575	@+-$(RM) $(@:s/.lib/.lin/)	678	@+-$(RM) $(@:s/.lib/.lin/)
576	.IF "$(LIB8OBJFILES)"!=""	679	.IF "$(LIB8OBJFILES)"!=""
Lines 580-585 Link Here
580	@-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	683	@-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
581	.ENDIF # "$(LIB8FILES)"!=""	684	.ENDIF # "$(LIB8FILES)"!=""
582	@+$(ECHONL)	685	@+$(ECHONL)
		686	.ENDIF
583	.ELSE # "$(GUI)"=="WNT"	687	.ELSE # "$(GUI)"=="WNT"
584	@+-$(RM) $@	688	@+-$(RM) $@
585	+echo $(LIBMGR) r $@ $(LIB8OBJFILES)	689	+echo $(LIBMGR) r $@ $(LIB8OBJFILES)
Lines 614-622 Link Here
614	@+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd	718	@+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
615	.ENDIF	719	.ENDIF
616	@cat $(MISC)$/$(LIB9ARCHIV:b).cmd	720	@cat $(MISC)$/$(LIB9ARCHIV:b).cmd
617	@source $(MISC)$/$(LIB9ARCHIV:b).cmd	721	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
618	.ELSE # "$(GUI)"=="UNX"	722	.ELSE # "$(GUI)"=="UNX"
		723	.IF "$(GUI)$(COM)"=="WNTGCC"
		724	@+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
		725	@+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
		726	@+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
		727	@cat $(MISC)$/$(LIB9ARCHIV:b).cmd
		728	@+source $(MISC)$/$(LIB9ARCHIV:b).cmd
		729	.ELSE
619	@echo just a dummy > $@	730	@echo just a dummy > $@
		731	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
620	.ENDIF # "$(GUI)"=="UNX"	732	.ENDIF # "$(GUI)"=="UNX"
621		733
622	.ENDIF # "$(LIB9ARCHIV)" != ""	734	.ENDIF # "$(LIB9ARCHIV)" != ""
Lines 645-650 Link Here
645	@+cat /dev/null $(LIB9FILES) \| xargs -n 1 >> $@	757	@+cat /dev/null $(LIB9FILES) \| xargs -n 1 >> $@
646	.ELSE # "$(GUI)"=="MAC"	758	.ELSE # "$(GUI)"=="MAC"
647	.IF "$(GUI)"=="WNT"	759	.IF "$(GUI)"=="WNT"
		760	.IF "$(COM)"=="GCC"
		761	+$(ECHONL) $(LIB9OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		762	@+cat /dev/null $(LIB9FILES) \| xargs -n1 >> $@
		763	.ELSE
648	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))	764	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
649	@+-$(RM) $(@:s/.lib/.lin/)	765	@+-$(RM) $(@:s/.lib/.lin/)
650	.IF "$(LIB9OBJFILES)"!=""	766	.IF "$(LIB9OBJFILES)"!=""
Lines 654-659 Link Here
654	@-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	770	@-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
655	.ENDIF # "$(LIB9FILES)"!=""	771	.ENDIF # "$(LIB9FILES)"!=""
656	@+$(ECHONL)	772	@+$(ECHONL)
		773	.ENDIF
657	.ELSE # "$(GUI)"=="WNT"	774	.ELSE # "$(GUI)"=="WNT"
658	@+-$(RM) $@	775	@+-$(RM) $@
659	+echo $(LIBMGR) r $@ $(LIB9OBJFILES)	776	+echo $(LIBMGR) r $@ $(LIB9OBJFILES)
Lines 688-696 Link Here
688	@+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd	805	@+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
689	.ENDIF	806	.ENDIF
690	@cat $(MISC)$/$(LIB10ARCHIV:b).cmd	807	@cat $(MISC)$/$(LIB10ARCHIV:b).cmd
691	@source $(MISC)$/$(LIB10ARCHIV:b).cmd	808	@source $(MISC)$/$(LIB1ARCHIV:b).cmd
692	.ELSE # "$(GUI)"=="UNX"	809	.ELSE # "$(GUI)"=="UNX"
		810	.IF "$(GUI)$(COM)"=="WNTGCC"
		811	@+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
		812	@+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) \| sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
		813	@+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
		814	@cat $(MISC)$/$(LIB10ARCHIV:b).cmd
		815	@+source $(MISC)$/$(LIB10ARCHIV:b).cmd
		816	.ELSE
693	@echo just a dummy > $@	817	@echo just a dummy > $@
		818	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
694	.ENDIF # "$(GUI)"=="UNX"	819	.ENDIF # "$(GUI)"=="UNX"
695		820
696	.ENDIF # "$(LIB10ARCHIV)" != ""	821	.ENDIF # "$(LIB10ARCHIV)" != ""
Lines 719-724 Link Here
719	@+cat /dev/null $(LIB10FILES) \| xargs -n 1 >> $@	844	@+cat /dev/null $(LIB10FILES) \| xargs -n 1 >> $@
720	.ELSE # "$(GUI)"=="MAC"	845	.ELSE # "$(GUI)"=="MAC"
721	.IF "$(GUI)"=="WNT"	846	.IF "$(GUI)"=="WNT"
		847	.IF "$(COM)"=="GCC"
		848	+$(ECHONL) $(LIB10OBJFILES) \| sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" \| xargs -n1 > $@
		849	@+cat /dev/null $(LIB10FILES) \| xargs -n1 >> $@
		850	.ELSE
722	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))	851	$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
723	@+-$(RM) $(@:s/.lib/.lin/)	852	@+-$(RM) $(@:s/.lib/.lin/)
724	.IF "$(LIB10OBJFILES)"!=""	853	.IF "$(LIB10OBJFILES)"!=""
Lines 728-733 Link Here
728	@-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)	857	@-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
729	.ENDIF # "$(LIB10FILES)"!=""	858	.ENDIF # "$(LIB10FILES)"!=""
730	@+$(ECHONL)	859	@+$(ECHONL)
		860	.ENDIF
731	.ELSE # "$(GUI)"=="WNT"	861	.ELSE # "$(GUI)"=="WNT"
732	@+-$(RM) $@	862	@+-$(RM) $@
733	+echo $(LIBMGR) r $@ $(LIB10OBJFILES)	863	+echo $(LIBMGR) r $@ $(LIB10OBJFILES)

Lines 910-915 Link Here

(-)oo_1.1.1_src/solenv/inc/target.mk.orig (+74 lines)
910	.ENDIF	910	.ENDIF
911		911
912	.IF "$(SHL1TARGET)"!=""	912	.IF "$(SHL1TARGET)"!=""
		913	.IF "$(GUI)$(COM)"=="WNTGCC"
		914	SHL1ARCHIV!:=$(SHL1TARGET)
		915	.ENDIF
913	.IF "$(WINVERSIONNAMES)"!=""	916	.IF "$(WINVERSIONNAMES)"!=""
914	SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)	917	SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
915	.ENDIF # "$(WINVERSIONNAMES)"!=""	918	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 931-936 Link Here
931	.ENDIF	934	.ENDIF
932		935
933	.IF "$(SHL2TARGET)"!=""	936	.IF "$(SHL2TARGET)"!=""
		937	.IF "$(GUI)$(COM)"=="WNTGCC"
		938	SHL2ARCHIV!:=$(SHL2TARGET)
		939	.ENDIF
934	.IF "$(WINVERSIONNAMES)"!=""	940	.IF "$(WINVERSIONNAMES)"!=""
935	SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)	941	SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
936	.ENDIF # "$(WINVERSIONNAMES)"!=""	942	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 952-957 Link Here
952	.ENDIF	958	.ENDIF
953		959
954	.IF "$(SHL3TARGET)"!=""	960	.IF "$(SHL3TARGET)"!=""
		961	.IF "$(GUI)$(COM)"=="WNTGCC"
		962	SHL3ARCHIV!:=$(SHL3TARGET)
		963	.ENDIF
955	.IF "$(WINVERSIONNAMES)"!=""	964	.IF "$(WINVERSIONNAMES)"!=""
956	SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)	965	SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
957	.ENDIF # "$(WINVERSIONNAMES)"!=""	966	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 973-978 Link Here
973	.ENDIF	982	.ENDIF
974		983
975	.IF "$(SHL4TARGET)"!=""	984	.IF "$(SHL4TARGET)"!=""
		985	.IF "$(GUI)$(COM)"=="WNTGCC"
		986	SHL4ARCHIV!:=$(SHL4TARGET)
		987	.ENDIF
976	.IF "$(WINVERSIONNAMES)"!=""	988	.IF "$(WINVERSIONNAMES)"!=""
977	SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)	989	SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
978	.ENDIF # "$(WINVERSIONNAMES)"!=""	990	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 994-999 Link Here
994	.ENDIF	1006	.ENDIF
995		1007
996	.IF "$(SHL5TARGET)"!=""	1008	.IF "$(SHL5TARGET)"!=""
		1009	.IF "$(GUI)$(COM)"=="WNTGCC"
		1010	SHL5ARCHIV!:=$(SHL5TARGET)
		1011	.ENDIF
997	.IF "$(WINVERSIONNAMES)"!=""	1012	.IF "$(WINVERSIONNAMES)"!=""
998	SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)	1013	SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
999	.ENDIF # "$(WINVERSIONNAMES)"!=""	1014	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 1015-1020 Link Here
1015	.ENDIF	1030	.ENDIF
1016		1031
1017	.IF "$(SHL6TARGET)"!=""	1032	.IF "$(SHL6TARGET)"!=""
		1033	.IF "$(GUI)$(COM)"=="WNTGCC"
		1034	SHL6ARCHIV!:=$(SHL6TARGET)
		1035	.ENDIF
1018	.IF "$(WINVERSIONNAMES)"!=""	1036	.IF "$(WINVERSIONNAMES)"!=""
1019	SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)	1037	SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
1020	.ENDIF # "$(WINVERSIONNAMES)"!=""	1038	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 1036-1041 Link Here
1036	.ENDIF	1054	.ENDIF
1037		1055
1038	.IF "$(SHL7TARGET)"!=""	1056	.IF "$(SHL7TARGET)"!=""
		1057	.IF "$(GUI)$(COM)"=="WNTGCC"
		1058	SHL7ARCHIV!:=$(SHL7TARGET)
		1059	.ENDIF
1039	.IF "$(WINVERSIONNAMES)"!=""	1060	.IF "$(WINVERSIONNAMES)"!=""
1040	SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)	1061	SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
1041	.ENDIF # "$(WINVERSIONNAMES)"!=""	1062	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 1057-1062 Link Here
1057	.ENDIF	1078	.ENDIF
1058		1079
1059	.IF "$(SHL8TARGET)"!=""	1080	.IF "$(SHL8TARGET)"!=""
		1081	.IF "$(GUI)$(COM)"=="WNTGCC"
		1082	SHL8ARCHIV!:=$(SHL8TARGET)
		1083	.ENDIF
1060	.IF "$(WINVERSIONNAMES)"!=""	1084	.IF "$(WINVERSIONNAMES)"!=""
1061	SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)	1085	SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
1062	.ENDIF # "$(WINVERSIONNAMES)"!=""	1086	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 1078-1083 Link Here
1078	.ENDIF	1102	.ENDIF
1079		1103
1080	.IF "$(SHL9TARGET)"!=""	1104	.IF "$(SHL9TARGET)"!=""
		1105	.IF "$(GUI)$(COM)"=="WNTGCC"
		1106	SHL9ARCHIV!:=$(SHL9TARGET)
		1107	.ENDIF
1081	.IF "$(WINVERSIONNAMES)"!=""	1108	.IF "$(WINVERSIONNAMES)"!=""
1082	SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)	1109	SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
1083	.ENDIF # "$(WINVERSIONNAMES)"!=""	1110	.ENDIF # "$(WINVERSIONNAMES)"!=""
Lines 1429-1477 Link Here
1429	.IF "$(LIB1TARGET)" != ""	1456	.IF "$(LIB1TARGET)" != ""
1430	LIB1 ?= TNR!:=1	1457	LIB1 ?= TNR!:=1
1431	LIB1TARGETN=$(LIB1TARGET)	1458	LIB1TARGETN=$(LIB1TARGET)
		1459	.IF "$(LIB1ARCHIV)" != ""
		1460	.IF "$(GUI)$(COM)"=="WNTGCC"
		1461	LIB1ARCHIV!:=$(LIB1ARCHIV:d)$(LIB1ARCHIV:b)_static.a
		1462	.ENDIF
		1463	.ENDIF
1432	.ENDIF	1464	.ENDIF
1433		1465
1434	.IF "$(LIB2TARGET)" != ""	1466	.IF "$(LIB2TARGET)" != ""
1435	LIB2 ?= TNR!:=2	1467	LIB2 ?= TNR!:=2
1436	LIB2TARGETN=$(LIB2TARGET)	1468	LIB2TARGETN=$(LIB2TARGET)
		1469	.IF "$(LIB2ARCHIV)" != ""
		1470	.IF "$(GUI)$(COM)"=="WNTGCC"
		1471	LIB2ARCHIV!:=$(LIB2ARCHIV:d)$(LIB2ARCHIV:b)_static.a
		1472	.ENDIF
		1473	.ENDIF
1437	.ENDIF	1474	.ENDIF
1438		1475
1439	.IF "$(LIB3TARGET)" != ""	1476	.IF "$(LIB3TARGET)" != ""
1440	LIB3 ?= TNR!:=3	1477	LIB3 ?= TNR!:=3
1441	LIB3TARGETN=$(LIB3TARGET)	1478	LIB3TARGETN=$(LIB3TARGET)
		1479	.IF "$(LIB3ARCHIV)" != ""
		1480	.IF "$(GUI)$(COM)"=="WNTGCC"
		1481	LIB3ARCHIV!:=$(LIB3ARCHIV:d)$(LIB3ARCHIV:b)_static.a
		1482	.ENDIF
		1483	.ENDIF
1442	.ENDIF	1484	.ENDIF
1443		1485
1444	.IF "$(LIB4TARGET)" != ""	1486	.IF "$(LIB4TARGET)" != ""
1445	LIB4 ?= TNR!:=4	1487	LIB4 ?= TNR!:=4
1446	LIB4TARGETN=$(LIB4TARGET)	1488	LIB4TARGETN=$(LIB4TARGET)
		1489	.IF "$(LIB4ARCHIV)" != ""
		1490	.IF "$(GUI)$(COM)"=="WNTGCC"
		1491	LIB4ARCHIV!:=$(LIB4ARCHIV:d)$(LIB4ARCHIV:b)_static.a
		1492	.ENDIF
		1493	.ENDIF
1447	.ENDIF	1494	.ENDIF
1448		1495
1449	.IF "$(LIB5TARGET)" != ""	1496	.IF "$(LIB5TARGET)" != ""
1450	LIB5 ?= TNR!:=5	1497	LIB5 ?= TNR!:=5
1451	LIB5TARGETN=$(LIB5TARGET)	1498	LIB5TARGETN=$(LIB5TARGET)
		1499	.IF "$(LIB5ARCHIV)" != ""
		1500	.IF "$(GUI)$(COM)"=="WNTGCC"
		1501	LIB5ARCHIV!:=$(LIB5ARCHIV:d)$(LIB5ARCHIV:b)_static.a
		1502	.ENDIF
		1503	.ENDIF
1452	.ENDIF	1504	.ENDIF
1453		1505
1454	.IF "$(LIB6TARGET)" != ""	1506	.IF "$(LIB6TARGET)" != ""
1455	LIB6 ?= TNR!:=6	1507	LIB6 ?= TNR!:=6
1456	LIB6TARGETN=$(LIB6TARGET)	1508	LIB6TARGETN=$(LIB6TARGET)
		1509	.IF "$(LIB6ARCHIV)" != ""
		1510	.IF "$(GUI)$(COM)"=="WNTGCC"
		1511	LIB6ARCHIV!:=$(LIB6ARCHIV:d)$(LIB6ARCHIV:b)_static.a
		1512	.ENDIF
		1513	.ENDIF
1457	.ENDIF	1514	.ENDIF
1458		1515
1459	.IF "$(LIB7TARGET)" != ""	1516	.IF "$(LIB7TARGET)" != ""
1460	LIB7 ?= TNR!:=7	1517	LIB7 ?= TNR!:=7
1461	LIB7TARGETN=$(LIB7TARGET)	1518	LIB7TARGETN=$(LIB7TARGET)
		1519	.IF "$(LIB7ARCHIV)" != ""
		1520	.IF "$(GUI)$(COM)"=="WNTGCC"
		1521	LIB7ARCHIV!:=$(LIB7ARCHIV:d)$(LIB7ARCHIV:b)_static.a
		1522	.ENDIF
		1523	.ENDIF
1462	.ENDIF	1524	.ENDIF
1463		1525
1464	.IF "$(LIB8TARGET)" != ""	1526	.IF "$(LIB8TARGET)" != ""
1465	LIB8 ?= TNR!:=8	1527	LIB8 ?= TNR!:=8
1466	LIB8TARGETN=$(LIB8TARGET)	1528	LIB8TARGETN=$(LIB8TARGET)
		1529	.IF "$(LIB8ARCHIV)" != ""
		1530	.IF "$(GUI)$(COM)"=="WNTGCC"
		1531	LIB8ARCHIV!:=$(LIB8ARCHIV:d)$(LIB8ARCHIV:b)_static.a
		1532	.ENDIF
		1533	.ENDIF
1467	.ENDIF	1534	.ENDIF
1468		1535
1469	.IF "$(LIB9TARGET)" != ""	1536	.IF "$(LIB9TARGET)" != ""
1470	LIB9 ?= TNR!:=9	1537	LIB9 ?= TNR!:=9
1471	LIB9TARGETN=$(LIB9TARGET)	1538	LIB9TARGETN=$(LIB9TARGET)
		1539	.IF "$(LIB9ARCHIV)" != ""
		1540	.IF "$(GUI)$(COM)"=="WNTGCC"
		1541	LIB9ARCHIV!:=$(LIB9ARCHIV:d)$(LIB9ARCHIV:b)_static.a
		1542	.ENDIF
		1543	.ENDIF
1472	.ENDIF	1544	.ENDIF
1473		1545
1474	.IF "$(GUI)"=="WNT"	1546	.IF "$(GUI)"=="WNT"
		1547	.IF "$(COM)"!="GCC"
1475	LIB1ARCHIV=	1548	LIB1ARCHIV=
1476	LIB2ARCHIV=	1549	LIB2ARCHIV=
1477	LIB3ARCHIV=	1550	LIB3ARCHIV=
Lines 1481-1486 Link Here
1481	LIB7ARCHIV=	1554	LIB7ARCHIV=
1482	LIB8ARCHIV=	1555	LIB8ARCHIV=
1483	LIB9ARCHIV=	1556	LIB9ARCHIV=
		1557	.ENDIF # "$(COM)"!="GCC"
1484	.ENDIF # "$(GUI)"=="WNT"	1558	.ENDIF # "$(GUI)"=="WNT"
1485		1559
1486	.IF "$(RESLIB1NAME)" != ""	1560	.IF "$(RESLIB1NAME)" != ""

Lines 114-120 Link Here

(-)oo_1.1.1_src/solenv/inc/rules.mk.orig (-9 / +39 lines)
114	@+-$(RM) $@ >& nul	114	@+-$(RM) $@ >& nul
115	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )	115	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )
116	@+$(ECHONL)	116	@+$(ECHONL)
		117	.IF "$(COM)"=="GCC"
		118	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx
		119	.ELSE
117	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )	120	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )
		121	.ENDIF
118	.ENDIF # "$(GUI)"=="UNX"	122	.ENDIF # "$(GUI)"=="UNX"
119		123
120	$(SLO)$/%.obj : %.cpp	124	$(SLO)$/%.obj : %.cpp
Lines 132-139 Link Here
132	@+-$(RM) $@ >& nul	136	@+-$(RM) $@ >& nul
133	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )	137	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )
134	@+$(ECHONL)	138	@+$(ECHONL)
		139	.IF "$(COM)"=="GCC"
		140	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp
		141	.ELSE
135	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )	142	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )
136	.ENDIF	143	.ENDIF
		144	.ENDIF
137		145
138	$(SLO)$/%.obj : $(MISC)$/%.cxx	146	$(SLO)$/%.obj : $(MISC)$/%.cxx
139	@echo ------------------------------	147	@echo ------------------------------
Lines 149-156 Link Here
149	.ELSE	157	.ELSE
150	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )	158	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )
151	@+$(ECHONL)	159	@+$(ECHONL)
		160	.IF "$(COM)"=="GCC"
		161	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx
		162	.ELSE
152	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )	163	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )
153	.ENDIF	164	.ENDIF
		165	.ENDIF
154		166
155	$(OBJ)$/%.obj : $(MISC)$/%.cxx	167	$(OBJ)$/%.obj : $(MISC)$/%.cxx
156	@echo ------------------------------	168	@echo ------------------------------
Lines 166-173 Link Here
166	.ELSE	178	.ELSE
167	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )	179	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )
168	@+$(ECHONL)	180	@+$(ECHONL)
		181	.IF "$(COM)"=="GCC"
		182	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx
		183	.ELSE
169	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )	184	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(MISC)$/$.cxx )
170	.ENDIF	185	.ENDIF
		186	.ENDIF
171		187
172	$(OBJ)$/%.obj : %.c	188	$(OBJ)$/%.obj : %.c
173	@echo ------------------------------	189	@echo ------------------------------
Lines 181-192 Link Here
181	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	197	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
182	.ENDIF	198	.ENDIF
183	.ELSE	199	.ELSE
184	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )	200	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$.obj $.c )
185	@+$(ECHONL)	201	@+$(ECHONL)
		202	+-@echo Cflags: $(CFLAGS)
186	.IF "$(COM)"=="GCC"	203	.IF "$(COM)"=="GCC"
187	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c	204	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$.obj $.c
188	.ELSE	205	.ELSE
189	+-@echo Cflags: $(CFLAGS)
190	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )	206	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )
191	.ENDIF	207	.ENDIF
192	.ENDIF	208	.ENDIF
Lines 202-208 Link Here
202	@+-$(RM) $@ >& nul	218	@+-$(RM) $@ >& nul
203	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )	219	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )
204	@+$(ECHONL)	220	@+$(ECHONL)
205	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )	221	.IF "$(COM)"=="GCC"
		222	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$.obj $(MISCX)$/$.c
		223	.ELSE
		224	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )
		225	.ENDIF
206	.ENDIF	226	.ENDIF
207		227
208	$(SLO)$/%.obj : $(MISCX)$/%.c	228	$(SLO)$/%.obj : $(MISCX)$/%.c
Lines 217-225 Link Here
217	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )	237	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )
218	@+$(ECHONL)	238	@+$(ECHONL)
219	.IF "$(COM)"=="GCC"	239	.IF "$(COM)"=="GCC"
220	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c	240	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$.obj $(MISCX)$/$.c
221	.ELSE	241	.ELSE
222	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )	242	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )
223	.ENDIF	243	.ENDIF
224	.ENDIF	244	.ENDIF
225		245
Lines 233-241 Link Here
233	.ELSE	253	.ELSE
234	@+-$(RM) $@ >& nul	254	@+-$(RM) $@ >& nul
235	.IF "$(COM)"=="GCC"	255	.IF "$(COM)"=="GCC"
236	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c	256	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c
237	.ELSE	257	.ELSE
238	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c )	258	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c )
239	.ENDIF	259	.ENDIF
240	.ENDIF	260	.ENDIF
241		261
Lines 584-589 Link Here
584	$(SLO)$/%.obj : %.asm	604	$(SLO)$/%.obj : %.asm
585	@echo ------------------------------	605	@echo ------------------------------
586	@echo Making: $@	606	@echo Making: $@
		607	.IF "$(COM)"=="GCC"
		608	.IF "$(ASM)"=="ml"
		609	$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$.obj $.asm
		610	@+-$(RM) $*.err >& nul
		611	.ELSE # "$(ASM)"=="ml"
		612	@+-$(RM) $@ >& nul
		613	$(ASM) $(AFLAGS) $.asm,$(SLO)\$.obj;
		614	.ENDIF # "$(ASM)"=="ml"
		615	.ELSE
587	.IF "$(COM)"=="WTC"	616	.IF "$(COM)"=="WTC"
588	$(ASM) $(AFLAGS) -D$(COM) $.asm -fo=$(SLO)\$.obj	617	$(ASM) $(AFLAGS) -D$(COM) $.asm -fo=$(SLO)\$.obj
589	+-if exist $.err @del $.err	618	+-if exist $.err @del $.err
Lines 598-603 Link Here
598	.ENDIF # "$(ASM)"=="ml"	627	.ENDIF # "$(ASM)"=="ml"
599	.ENDIF "$(COM)"=="MSC"	628	.ENDIF "$(COM)"=="MSC"
600	.ENDIF	629	.ENDIF
		630	.ENDIF
601		631
602	$(OBJ)$/%.obj : %.asm	632	$(OBJ)$/%.obj : %.asm
603	@echo ------------------------------	633	@echo ------------------------------
Lines 625-631 Link Here
625	.SOURCE.idl : . $(SOLARVER)$/$(INPATH)$/idl$/remote $(SOLARVER)$/$(INPATH)$/idl $(SOLARVER)$/$(INPATH)$/idl$(UPDMINOREXT)$/$(PACKAGE)	655	.SOURCE.idl : . $(SOLARVER)$/$(INPATH)$/idl$/remote $(SOLARVER)$/$(INPATH)$/idl $(SOLARVER)$/$(INPATH)$/idl$(UPDMINOREXT)$/$(PACKAGE)
626		656
627	$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl	657	$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl
628	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $< )	658	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucr$/$(IDLPACKAGE) $< )
629		659
630	$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl	660	$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl
631	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $< )	661	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $< )

Lines 71-79 Link Here

(-)oo_1.1.1_src/solenv/inc/_tg_def.mk.orig (+120 lines)
71	@echo ------------------------------	71	@echo ------------------------------
72	@echo Making Module-Definitionfile : $@	72	@echo Making Module-Definitionfile : $@
73	@echo LIBRARY $(SHL1TARGET) >$@	73	@echo LIBRARY $(SHL1TARGET) >$@
		74	.IF "$(COM)"!="GCC"
74	@echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@	75	@echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@
75	@echo DATA READ WRITE SHARED >>$@	76	@echo DATA READ WRITE SHARED >>$@
76	@echo HEAPSIZE 0 >>$@	77	@echo HEAPSIZE 0 >>$@
		78	.ENDIF
77	@echo EXPORTS >>$@	79	@echo EXPORTS >>$@
78	# getversioninfo fuer alle!!	80	# getversioninfo fuer alle!!
79	@echo GetVersionInfo >>$@	81	@echo GetVersionInfo >>$@
Lines 81-86 Link Here
81	@echo component_getDescriptionFunc >>$@	83	@echo component_getDescriptionFunc >>$@
82	.ENDIF # "$(NO_SHL1DESCRIPTION)"==""	84	.ENDIF # "$(NO_SHL1DESCRIPTION)"==""
83	.IF "$(DEFLIB1NAME)"!=""	85	.IF "$(DEFLIB1NAME)"!=""
		86	.IF "$(COM)"=="GCC"
		87	dlltool --output-def $(SHL1TARGET).exp --export-all-symbols \
		88	`$(TYPE) $(SLB)$/$(DEFLIB1NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		89	tail --lines +3 $(SHL1TARGET).exp >>$@
		90	.ELSE
84	@+$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib	91	@+$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
85	.IF "$(USE_LDUMP2)"=!""	92	.IF "$(USE_LDUMP2)"=!""
86	.IF "$(DEF1CEXP)"!=""	93	.IF "$(DEF1CEXP)"!=""
Lines 91-96 Link Here
91	.ELSE # "$(USE_LDUMP2)"=!""	98	.ELSE # "$(USE_LDUMP2)"=!""
92	@+$(EXPORT1_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp >>$@	99	@+$(EXPORT1_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp >>$@
93	.ENDIF # "$(USE_LDUMP2)"=!""	100	.ENDIF # "$(USE_LDUMP2)"=!""
		101	.ENDIF
94	+$(EXPORT1_PROTECT) $(RM) $(SHL1TARGET).exp	102	+$(EXPORT1_PROTECT) $(RM) $(SHL1TARGET).exp
95	# now *\defs\$(OUTPATH) exists, commit it	103	# now *\defs\$(OUTPATH) exists, commit it
96	.IF "$(BUILD_SOSL)"==""	104	.IF "$(BUILD_SOSL)"==""
Lines 166-173 Link Here
166	@echo $(DEF1EXPORT20) >>$@	174	@echo $(DEF1EXPORT20) >>$@
167	.ENDIF	175	.ENDIF
168	.IF "$(DEF1EXPORTFILE)"!=""	176	.IF "$(DEF1EXPORTFILE)"!=""
		177	.IF "$(COM)"=="GCC"
		178	+$(TYPE) $(DEF1EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		179	.ELSE
169	+$(TYPE) $(DEF1EXPORTFILE) >> $@	180	+$(TYPE) $(DEF1EXPORTFILE) >> $@
170	.ENDIF	181	.ENDIF
		182	.ENDIF
171	.ENDIF # "$(APP1HEAP)"==""	183	.ENDIF # "$(APP1HEAP)"==""
172	.ENDIF # "$(GUI)"=="WNT"	184	.ENDIF # "$(GUI)"=="WNT"
173		185
Lines 257-265 Link Here
257	@echo ------------------------------	269	@echo ------------------------------
258	@echo Making Module-Definitionfile : $@	270	@echo Making Module-Definitionfile : $@
259	@echo LIBRARY $(SHL2TARGET) >$@	271	@echo LIBRARY $(SHL2TARGET) >$@
		272	.IF "$(COM)"!="GCC"
260	@echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@	273	@echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@
261	@echo DATA READ WRITE SHARED >>$@	274	@echo DATA READ WRITE SHARED >>$@
262	@echo HEAPSIZE 0 >>$@	275	@echo HEAPSIZE 0 >>$@
		276	.ENDIF
263	@echo EXPORTS >>$@	277	@echo EXPORTS >>$@
264	# getversioninfo fuer alle!!	278	# getversioninfo fuer alle!!
265	@echo GetVersionInfo >>$@	279	@echo GetVersionInfo >>$@
Lines 267-272 Link Here
267	@echo component_getDescriptionFunc >>$@	281	@echo component_getDescriptionFunc >>$@
268	.ENDIF # "$(NO_SHL2DESCRIPTION)"==""	282	.ENDIF # "$(NO_SHL2DESCRIPTION)"==""
269	.IF "$(DEFLIB2NAME)"!=""	283	.IF "$(DEFLIB2NAME)"!=""
		284	.IF "$(COM)"=="GCC"
		285	dlltool --output-def $(SHL2TARGET).exp --export-all-symbols \
		286	`$(TYPE) $(SLB)$/$(DEFLIB2NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		287	tail --lines +3 $(SHL2TARGET).exp >>$@
		288	.ELSE
270	@+$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib	289	@+$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
271	.IF "$(USE_LDUMP2)"=!""	290	.IF "$(USE_LDUMP2)"=!""
272	.IF "$(DEF2CEXP)"!=""	291	.IF "$(DEF2CEXP)"!=""
Lines 277-282 Link Here
277	.ELSE # "$(USE_LDUMP2)"=!""	296	.ELSE # "$(USE_LDUMP2)"=!""
278	@+$(EXPORT2_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp >>$@	297	@+$(EXPORT2_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp >>$@
279	.ENDIF # "$(USE_LDUMP2)"=!""	298	.ENDIF # "$(USE_LDUMP2)"=!""
		299	.ENDIF
280	+$(EXPORT2_PROTECT) $(RM) $(SHL2TARGET).exp	300	+$(EXPORT2_PROTECT) $(RM) $(SHL2TARGET).exp
281	# now *\defs\$(OUTPATH) exists, commit it	301	# now *\defs\$(OUTPATH) exists, commit it
282	.IF "$(BUILD_SOSL)"==""	302	.IF "$(BUILD_SOSL)"==""
Lines 352-359 Link Here
352	@echo $(DEF2EXPORT20) >>$@	372	@echo $(DEF2EXPORT20) >>$@
353	.ENDIF	373	.ENDIF
354	.IF "$(DEF2EXPORTFILE)"!=""	374	.IF "$(DEF2EXPORTFILE)"!=""
		375	.IF "$(COM)"=="GCC"
		376	+$(TYPE) $(DEF2EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		377	.ELSE
355	+$(TYPE) $(DEF2EXPORTFILE) >> $@	378	+$(TYPE) $(DEF2EXPORTFILE) >> $@
356	.ENDIF	379	.ENDIF
		380	.ENDIF
357	.ENDIF # "$(APP2HEAP)"==""	381	.ENDIF # "$(APP2HEAP)"==""
358	.ENDIF # "$(GUI)"=="WNT"	382	.ENDIF # "$(GUI)"=="WNT"
359		383
Lines 443-451 Link Here
443	@echo ------------------------------	467	@echo ------------------------------
444	@echo Making Module-Definitionfile : $@	468	@echo Making Module-Definitionfile : $@
445	@echo LIBRARY $(SHL3TARGET) >$@	469	@echo LIBRARY $(SHL3TARGET) >$@
		470	.IF "$(COM)"!="GCC"
446	@echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@	471	@echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@
447	@echo DATA READ WRITE SHARED >>$@	472	@echo DATA READ WRITE SHARED >>$@
448	@echo HEAPSIZE 0 >>$@	473	@echo HEAPSIZE 0 >>$@
		474	.ENDIF
449	@echo EXPORTS >>$@	475	@echo EXPORTS >>$@
450	# getversioninfo fuer alle!!	476	# getversioninfo fuer alle!!
451	@echo GetVersionInfo >>$@	477	@echo GetVersionInfo >>$@
Lines 453-458 Link Here
453	@echo component_getDescriptionFunc >>$@	479	@echo component_getDescriptionFunc >>$@
454	.ENDIF # "$(NO_SHL3DESCRIPTION)"==""	480	.ENDIF # "$(NO_SHL3DESCRIPTION)"==""
455	.IF "$(DEFLIB3NAME)"!=""	481	.IF "$(DEFLIB3NAME)"!=""
		482	.IF "$(COM)"=="GCC"
		483	dlltool --output-def $(SHL3TARGET).exp --export-all-symbols \
		484	`$(TYPE) $(SLB)$/$(DEFLIB3NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		485	tail --lines +3 $(SHL3TARGET).exp >>$@
		486	.ELSE
456	@+$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib	487	@+$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
457	.IF "$(USE_LDUMP2)"=!""	488	.IF "$(USE_LDUMP2)"=!""
458	.IF "$(DEF3CEXP)"!=""	489	.IF "$(DEF3CEXP)"!=""
Lines 463-468 Link Here
463	.ELSE # "$(USE_LDUMP2)"=!""	494	.ELSE # "$(USE_LDUMP2)"=!""
464	@+$(EXPORT3_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp >>$@	495	@+$(EXPORT3_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp >>$@
465	.ENDIF # "$(USE_LDUMP2)"=!""	496	.ENDIF # "$(USE_LDUMP2)"=!""
		497	.ENDIF
466	+$(EXPORT3_PROTECT) $(RM) $(SHL3TARGET).exp	498	+$(EXPORT3_PROTECT) $(RM) $(SHL3TARGET).exp
467	# now *\defs\$(OUTPATH) exists, commit it	499	# now *\defs\$(OUTPATH) exists, commit it
468	.IF "$(BUILD_SOSL)"==""	500	.IF "$(BUILD_SOSL)"==""
Lines 538-545 Link Here
538	@echo $(DEF3EXPORT20) >>$@	570	@echo $(DEF3EXPORT20) >>$@
539	.ENDIF	571	.ENDIF
540	.IF "$(DEF3EXPORTFILE)"!=""	572	.IF "$(DEF3EXPORTFILE)"!=""
		573	.IF "$(COM)"=="GCC"
		574	+$(TYPE) $(DEF3EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		575	.ELSE
541	+$(TYPE) $(DEF3EXPORTFILE) >> $@	576	+$(TYPE) $(DEF3EXPORTFILE) >> $@
542	.ENDIF	577	.ENDIF
		578	.ENDIF
543	.ENDIF # "$(APP3HEAP)"==""	579	.ENDIF # "$(APP3HEAP)"==""
544	.ENDIF # "$(GUI)"=="WNT"	580	.ENDIF # "$(GUI)"=="WNT"
545		581
Lines 629-637 Link Here
629	@echo ------------------------------	665	@echo ------------------------------
630	@echo Making Module-Definitionfile : $@	666	@echo Making Module-Definitionfile : $@
631	@echo LIBRARY $(SHL4TARGET) >$@	667	@echo LIBRARY $(SHL4TARGET) >$@
		668	.IF "$(COM)"!="GCC"
632	@echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@	669	@echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@
633	@echo DATA READ WRITE SHARED >>$@	670	@echo DATA READ WRITE SHARED >>$@
634	@echo HEAPSIZE 0 >>$@	671	@echo HEAPSIZE 0 >>$@
		672	.ENDIF
635	@echo EXPORTS >>$@	673	@echo EXPORTS >>$@
636	# getversioninfo fuer alle!!	674	# getversioninfo fuer alle!!
637	@echo GetVersionInfo >>$@	675	@echo GetVersionInfo >>$@
Lines 639-644 Link Here
639	@echo component_getDescriptionFunc >>$@	677	@echo component_getDescriptionFunc >>$@
640	.ENDIF # "$(NO_SHL4DESCRIPTION)"==""	678	.ENDIF # "$(NO_SHL4DESCRIPTION)"==""
641	.IF "$(DEFLIB4NAME)"!=""	679	.IF "$(DEFLIB4NAME)"!=""
		680	.IF "$(COM)"=="GCC"
		681	dlltool --output-def $(SHL4TARGET).exp --export-all-symbols \
		682	`$(TYPE) $(SLB)$/$(DEFLIB4NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		683	tail --lines +3 $(SHL4TARGET).exp >>$@
		684	.ELSE
642	@+$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib	685	@+$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
643	.IF "$(USE_LDUMP2)"=!""	686	.IF "$(USE_LDUMP2)"=!""
644	.IF "$(DEF4CEXP)"!=""	687	.IF "$(DEF4CEXP)"!=""
Lines 649-654 Link Here
649	.ELSE # "$(USE_LDUMP2)"=!""	692	.ELSE # "$(USE_LDUMP2)"=!""
650	@+$(EXPORT4_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp >>$@	693	@+$(EXPORT4_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp >>$@
651	.ENDIF # "$(USE_LDUMP2)"=!""	694	.ENDIF # "$(USE_LDUMP2)"=!""
		695	.ENDIF
652	+$(EXPORT4_PROTECT) $(RM) $(SHL4TARGET).exp	696	+$(EXPORT4_PROTECT) $(RM) $(SHL4TARGET).exp
653	# now *\defs\$(OUTPATH) exists, commit it	697	# now *\defs\$(OUTPATH) exists, commit it
654	.IF "$(BUILD_SOSL)"==""	698	.IF "$(BUILD_SOSL)"==""
Lines 724-731 Link Here
724	@echo $(DEF4EXPORT20) >>$@	768	@echo $(DEF4EXPORT20) >>$@
725	.ENDIF	769	.ENDIF
726	.IF "$(DEF4EXPORTFILE)"!=""	770	.IF "$(DEF4EXPORTFILE)"!=""
		771	.IF "$(COM)"=="GCC"
		772	+$(TYPE) $(DEF4EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		773	.ELSE
727	+$(TYPE) $(DEF4EXPORTFILE) >> $@	774	+$(TYPE) $(DEF4EXPORTFILE) >> $@
728	.ENDIF	775	.ENDIF
		776	.ENDIF
729	.ENDIF # "$(APP4HEAP)"==""	777	.ENDIF # "$(APP4HEAP)"==""
730	.ENDIF # "$(GUI)"=="WNT"	778	.ENDIF # "$(GUI)"=="WNT"
731		779
Lines 815-823 Link Here
815	@echo ------------------------------	863	@echo ------------------------------
816	@echo Making Module-Definitionfile : $@	864	@echo Making Module-Definitionfile : $@
817	@echo LIBRARY $(SHL5TARGET) >$@	865	@echo LIBRARY $(SHL5TARGET) >$@
		866	.IF "$(COM)"!="GCC"
818	@echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@	867	@echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@
819	@echo DATA READ WRITE SHARED >>$@	868	@echo DATA READ WRITE SHARED >>$@
820	@echo HEAPSIZE 0 >>$@	869	@echo HEAPSIZE 0 >>$@
		870	.ENDIF
821	@echo EXPORTS >>$@	871	@echo EXPORTS >>$@
822	# getversioninfo fuer alle!!	872	# getversioninfo fuer alle!!
823	@echo GetVersionInfo >>$@	873	@echo GetVersionInfo >>$@
Lines 825-830 Link Here
825	@echo component_getDescriptionFunc >>$@	875	@echo component_getDescriptionFunc >>$@
826	.ENDIF # "$(NO_SHL5DESCRIPTION)"==""	876	.ENDIF # "$(NO_SHL5DESCRIPTION)"==""
827	.IF "$(DEFLIB5NAME)"!=""	877	.IF "$(DEFLIB5NAME)"!=""
		878	.IF "$(COM)"=="GCC"
		879	dlltool --output-def $(SHL5TARGET).exp --export-all-symbols \
		880	`$(TYPE) $(SLB)$/$(DEFLIB5NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		881	tail --lines +3 $(SHL5TARGET).exp >>$@
		882	.ELSE
828	@+$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib	883	@+$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
829	.IF "$(USE_LDUMP2)"=!""	884	.IF "$(USE_LDUMP2)"=!""
830	.IF "$(DEF5CEXP)"!=""	885	.IF "$(DEF5CEXP)"!=""
Lines 835-840 Link Here
835	.ELSE # "$(USE_LDUMP2)"=!""	890	.ELSE # "$(USE_LDUMP2)"=!""
836	@+$(EXPORT5_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp >>$@	891	@+$(EXPORT5_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp >>$@
837	.ENDIF # "$(USE_LDUMP2)"=!""	892	.ENDIF # "$(USE_LDUMP2)"=!""
		893	.ENDIF
838	+$(EXPORT5_PROTECT) $(RM) $(SHL5TARGET).exp	894	+$(EXPORT5_PROTECT) $(RM) $(SHL5TARGET).exp
839	# now *\defs\$(OUTPATH) exists, commit it	895	# now *\defs\$(OUTPATH) exists, commit it
840	.IF "$(BUILD_SOSL)"==""	896	.IF "$(BUILD_SOSL)"==""
Lines 910-917 Link Here
910	@echo $(DEF5EXPORT20) >>$@	966	@echo $(DEF5EXPORT20) >>$@
911	.ENDIF	967	.ENDIF
912	.IF "$(DEF5EXPORTFILE)"!=""	968	.IF "$(DEF5EXPORTFILE)"!=""
		969	.IF "$(COM)"=="GCC"
		970	+$(TYPE) $(DEF5EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		971	.ELSE
913	+$(TYPE) $(DEF5EXPORTFILE) >> $@	972	+$(TYPE) $(DEF5EXPORTFILE) >> $@
914	.ENDIF	973	.ENDIF
		974	.ENDIF
915	.ENDIF # "$(APP5HEAP)"==""	975	.ENDIF # "$(APP5HEAP)"==""
916	.ENDIF # "$(GUI)"=="WNT"	976	.ENDIF # "$(GUI)"=="WNT"
917		977
Lines 1001-1009 Link Here
1001	@echo ------------------------------	1061	@echo ------------------------------
1002	@echo Making Module-Definitionfile : $@	1062	@echo Making Module-Definitionfile : $@
1003	@echo LIBRARY $(SHL6TARGET) >$@	1063	@echo LIBRARY $(SHL6TARGET) >$@
		1064	.IF "$(COM)"!="GCC"
1004	@echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@	1065	@echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@
1005	@echo DATA READ WRITE SHARED >>$@	1066	@echo DATA READ WRITE SHARED >>$@
1006	@echo HEAPSIZE 0 >>$@	1067	@echo HEAPSIZE 0 >>$@
		1068	.ENDIF
1007	@echo EXPORTS >>$@	1069	@echo EXPORTS >>$@
1008	# getversioninfo fuer alle!!	1070	# getversioninfo fuer alle!!
1009	@echo GetVersionInfo >>$@	1071	@echo GetVersionInfo >>$@
Lines 1011-1016 Link Here
1011	@echo component_getDescriptionFunc >>$@	1073	@echo component_getDescriptionFunc >>$@
1012	.ENDIF # "$(NO_SHL6DESCRIPTION)"==""	1074	.ENDIF # "$(NO_SHL6DESCRIPTION)"==""
1013	.IF "$(DEFLIB6NAME)"!=""	1075	.IF "$(DEFLIB6NAME)"!=""
		1076	.IF "$(COM)"=="GCC"
		1077	dlltool --output-def $(SHL6TARGET).exp --export-all-symbols \
		1078	`$(TYPE) $(SLB)$/$(DEFLIB6NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		1079	tail --lines +3 $(SHL6TARGET).exp >>$@
		1080	.ELSE
1014	@+$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib	1081	@+$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
1015	.IF "$(USE_LDUMP2)"=!""	1082	.IF "$(USE_LDUMP2)"=!""
1016	.IF "$(DEF6CEXP)"!=""	1083	.IF "$(DEF6CEXP)"!=""
Lines 1021-1026 Link Here
1021	.ELSE # "$(USE_LDUMP2)"=!""	1088	.ELSE # "$(USE_LDUMP2)"=!""
1022	@+$(EXPORT6_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp >>$@	1089	@+$(EXPORT6_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp >>$@
1023	.ENDIF # "$(USE_LDUMP2)"=!""	1090	.ENDIF # "$(USE_LDUMP2)"=!""
		1091	.ENDIF
1024	+$(EXPORT6_PROTECT) $(RM) $(SHL6TARGET).exp	1092	+$(EXPORT6_PROTECT) $(RM) $(SHL6TARGET).exp
1025	# now *\defs\$(OUTPATH) exists, commit it	1093	# now *\defs\$(OUTPATH) exists, commit it
1026	.IF "$(BUILD_SOSL)"==""	1094	.IF "$(BUILD_SOSL)"==""
Lines 1096-1103 Link Here
1096	@echo $(DEF6EXPORT20) >>$@	1164	@echo $(DEF6EXPORT20) >>$@
1097	.ENDIF	1165	.ENDIF
1098	.IF "$(DEF6EXPORTFILE)"!=""	1166	.IF "$(DEF6EXPORTFILE)"!=""
		1167	.IF "$(COM)"=="GCC"
		1168	+$(TYPE) $(DEF6EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		1169	.ELSE
1099	+$(TYPE) $(DEF6EXPORTFILE) >> $@	1170	+$(TYPE) $(DEF6EXPORTFILE) >> $@
1100	.ENDIF	1171	.ENDIF
		1172	.ENDIF
1101	.ENDIF # "$(APP6HEAP)"==""	1173	.ENDIF # "$(APP6HEAP)"==""
1102	.ENDIF # "$(GUI)"=="WNT"	1174	.ENDIF # "$(GUI)"=="WNT"
1103		1175
Lines 1187-1195 Link Here
1187	@echo ------------------------------	1259	@echo ------------------------------
1188	@echo Making Module-Definitionfile : $@	1260	@echo Making Module-Definitionfile : $@
1189	@echo LIBRARY $(SHL7TARGET) >$@	1261	@echo LIBRARY $(SHL7TARGET) >$@
		1262	.IF "$(COM)"!="GCC"
1190	@echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@	1263	@echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@
1191	@echo DATA READ WRITE SHARED >>$@	1264	@echo DATA READ WRITE SHARED >>$@
1192	@echo HEAPSIZE 0 >>$@	1265	@echo HEAPSIZE 0 >>$@
		1266	.ENDIF
1193	@echo EXPORTS >>$@	1267	@echo EXPORTS >>$@
1194	# getversioninfo fuer alle!!	1268	# getversioninfo fuer alle!!
1195	@echo GetVersionInfo >>$@	1269	@echo GetVersionInfo >>$@
Lines 1197-1202 Link Here
1197	@echo component_getDescriptionFunc >>$@	1271	@echo component_getDescriptionFunc >>$@
1198	.ENDIF # "$(NO_SHL7DESCRIPTION)"==""	1272	.ENDIF # "$(NO_SHL7DESCRIPTION)"==""
1199	.IF "$(DEFLIB7NAME)"!=""	1273	.IF "$(DEFLIB7NAME)"!=""
		1274	.IF "$(COM)"=="GCC"
		1275	dlltool --output-def $(SHL7TARGET).exp --export-all-symbols \
		1276	`$(TYPE) $(SLB)$/$(DEFLIB7NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		1277	tail --lines +3 $(SHL7TARGET).exp >>$@
		1278	.ELSE
1200	@+$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib	1279	@+$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
1201	.IF "$(USE_LDUMP2)"=!""	1280	.IF "$(USE_LDUMP2)"=!""
1202	.IF "$(DEF7CEXP)"!=""	1281	.IF "$(DEF7CEXP)"!=""
Lines 1207-1212 Link Here
1207	.ELSE # "$(USE_LDUMP2)"=!""	1286	.ELSE # "$(USE_LDUMP2)"=!""
1208	@+$(EXPORT7_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp >>$@	1287	@+$(EXPORT7_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp >>$@
1209	.ENDIF # "$(USE_LDUMP2)"=!""	1288	.ENDIF # "$(USE_LDUMP2)"=!""
		1289	.ENDIF
1210	+$(EXPORT7_PROTECT) $(RM) $(SHL7TARGET).exp	1290	+$(EXPORT7_PROTECT) $(RM) $(SHL7TARGET).exp
1211	# now *\defs\$(OUTPATH) exists, commit it	1291	# now *\defs\$(OUTPATH) exists, commit it
1212	.IF "$(BUILD_SOSL)"==""	1292	.IF "$(BUILD_SOSL)"==""
Lines 1282-1289 Link Here
1282	@echo $(DEF7EXPORT20) >>$@	1362	@echo $(DEF7EXPORT20) >>$@
1283	.ENDIF	1363	.ENDIF
1284	.IF "$(DEF7EXPORTFILE)"!=""	1364	.IF "$(DEF7EXPORTFILE)"!=""
		1365	.IF "$(COM)"=="GCC"
		1366	+$(TYPE) $(DEF7EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		1367	.ELSE
1285	+$(TYPE) $(DEF7EXPORTFILE) >> $@	1368	+$(TYPE) $(DEF7EXPORTFILE) >> $@
1286	.ENDIF	1369	.ENDIF
		1370	.ENDIF
1287	.ENDIF # "$(APP7HEAP)"==""	1371	.ENDIF # "$(APP7HEAP)"==""
1288	.ENDIF # "$(GUI)"=="WNT"	1372	.ENDIF # "$(GUI)"=="WNT"
1289		1373
Lines 1373-1381 Link Here
1373	@echo ------------------------------	1457	@echo ------------------------------
1374	@echo Making Module-Definitionfile : $@	1458	@echo Making Module-Definitionfile : $@
1375	@echo LIBRARY $(SHL8TARGET) >$@	1459	@echo LIBRARY $(SHL8TARGET) >$@
		1460	.IF "$(COM)"!="GCC"
1376	@echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@	1461	@echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@
1377	@echo DATA READ WRITE SHARED >>$@	1462	@echo DATA READ WRITE SHARED >>$@
1378	@echo HEAPSIZE 0 >>$@	1463	@echo HEAPSIZE 0 >>$@
		1464	.ENDIF
1379	@echo EXPORTS >>$@	1465	@echo EXPORTS >>$@
1380	# getversioninfo fuer alle!!	1466	# getversioninfo fuer alle!!
1381	@echo GetVersionInfo >>$@	1467	@echo GetVersionInfo >>$@
Lines 1383-1388 Link Here
1383	@echo component_getDescriptionFunc >>$@	1469	@echo component_getDescriptionFunc >>$@
1384	.ENDIF # "$(NO_SHL8DESCRIPTION)"==""	1470	.ENDIF # "$(NO_SHL8DESCRIPTION)"==""
1385	.IF "$(DEFLIB8NAME)"!=""	1471	.IF "$(DEFLIB8NAME)"!=""
		1472	.IF "$(COM)"=="GCC"
		1473	dlltool --output-def $(SHL8TARGET).exp --export-all-symbols \
		1474	`$(TYPE) $(SLB)$/$(DEFLIB8NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		1475	tail --lines +3 $(SHL8TARGET).exp >>$@
		1476	.ELSE
1386	@+$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib	1477	@+$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
1387	.IF "$(USE_LDUMP2)"=!""	1478	.IF "$(USE_LDUMP2)"=!""
1388	.IF "$(DEF8CEXP)"!=""	1479	.IF "$(DEF8CEXP)"!=""
Lines 1393-1398 Link Here
1393	.ELSE # "$(USE_LDUMP2)"=!""	1484	.ELSE # "$(USE_LDUMP2)"=!""
1394	@+$(EXPORT8_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp >>$@	1485	@+$(EXPORT8_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp >>$@
1395	.ENDIF # "$(USE_LDUMP2)"=!""	1486	.ENDIF # "$(USE_LDUMP2)"=!""
		1487	.ENDIF
1396	+$(EXPORT8_PROTECT) $(RM) $(SHL8TARGET).exp	1488	+$(EXPORT8_PROTECT) $(RM) $(SHL8TARGET).exp
1397	# now *\defs\$(OUTPATH) exists, commit it	1489	# now *\defs\$(OUTPATH) exists, commit it
1398	.IF "$(BUILD_SOSL)"==""	1490	.IF "$(BUILD_SOSL)"==""
Lines 1468-1475 Link Here
1468	@echo $(DEF8EXPORT20) >>$@	1560	@echo $(DEF8EXPORT20) >>$@
1469	.ENDIF	1561	.ENDIF
1470	.IF "$(DEF8EXPORTFILE)"!=""	1562	.IF "$(DEF8EXPORTFILE)"!=""
		1563	.IF "$(COM)"=="GCC"
		1564	+$(TYPE) $(DEF8EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		1565	.ELSE
1471	+$(TYPE) $(DEF8EXPORTFILE) >> $@	1566	+$(TYPE) $(DEF8EXPORTFILE) >> $@
1472	.ENDIF	1567	.ENDIF
		1568	.ENDIF
1473	.ENDIF # "$(APP8HEAP)"==""	1569	.ENDIF # "$(APP8HEAP)"==""
1474	.ENDIF # "$(GUI)"=="WNT"	1570	.ENDIF # "$(GUI)"=="WNT"
1475		1571
Lines 1559-1567 Link Here
1559	@echo ------------------------------	1655	@echo ------------------------------
1560	@echo Making Module-Definitionfile : $@	1656	@echo Making Module-Definitionfile : $@
1561	@echo LIBRARY $(SHL9TARGET) >$@	1657	@echo LIBRARY $(SHL9TARGET) >$@
		1658	.IF "$(COM)"!="GCC"
1562	@echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@	1659	@echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@
1563	@echo DATA READ WRITE SHARED >>$@	1660	@echo DATA READ WRITE SHARED >>$@
1564	@echo HEAPSIZE 0 >>$@	1661	@echo HEAPSIZE 0 >>$@
		1662	.ENDIF
1565	@echo EXPORTS >>$@	1663	@echo EXPORTS >>$@
1566	# getversioninfo fuer alle!!	1664	# getversioninfo fuer alle!!
1567	@echo GetVersionInfo >>$@	1665	@echo GetVersionInfo >>$@
Lines 1569-1574 Link Here
1569	@echo component_getDescriptionFunc >>$@	1667	@echo component_getDescriptionFunc >>$@
1570	.ENDIF # "$(NO_SHL9DESCRIPTION)"==""	1668	.ENDIF # "$(NO_SHL9DESCRIPTION)"==""
1571	.IF "$(DEFLIB9NAME)"!=""	1669	.IF "$(DEFLIB9NAME)"!=""
		1670	.IF "$(COM)"=="GCC"
		1671	dlltool --output-def $(SHL9TARGET).exp --export-all-symbols \
		1672	`$(TYPE) $(SLB)$/$(DEFLIB9NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		1673	tail --lines +3 $(SHL9TARGET).exp >>$@
		1674	.ELSE
1572	@+$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib	1675	@+$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
1573	.IF "$(USE_LDUMP2)"=!""	1676	.IF "$(USE_LDUMP2)"=!""
1574	.IF "$(DEF9CEXP)"!=""	1677	.IF "$(DEF9CEXP)"!=""
Lines 1579-1584 Link Here
1579	.ELSE # "$(USE_LDUMP2)"=!""	1682	.ELSE # "$(USE_LDUMP2)"=!""
1580	@+$(EXPORT9_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp >>$@	1683	@+$(EXPORT9_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp >>$@
1581	.ENDIF # "$(USE_LDUMP2)"=!""	1684	.ENDIF # "$(USE_LDUMP2)"=!""
		1685	.ENDIF
1582	+$(EXPORT9_PROTECT) $(RM) $(SHL9TARGET).exp	1686	+$(EXPORT9_PROTECT) $(RM) $(SHL9TARGET).exp
1583	# now *\defs\$(OUTPATH) exists, commit it	1687	# now *\defs\$(OUTPATH) exists, commit it
1584	.IF "$(BUILD_SOSL)"==""	1688	.IF "$(BUILD_SOSL)"==""
Lines 1654-1661 Link Here
1654	@echo $(DEF9EXPORT20) >>$@	1758	@echo $(DEF9EXPORT20) >>$@
1655	.ENDIF	1759	.ENDIF
1656	.IF "$(DEF9EXPORTFILE)"!=""	1760	.IF "$(DEF9EXPORTFILE)"!=""
		1761	.IF "$(COM)"=="GCC"
		1762	+$(TYPE) $(DEF9EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		1763	.ELSE
1657	+$(TYPE) $(DEF9EXPORTFILE) >> $@	1764	+$(TYPE) $(DEF9EXPORTFILE) >> $@
1658	.ENDIF	1765	.ENDIF
		1766	.ENDIF
1659	.ENDIF # "$(APP9HEAP)"==""	1767	.ENDIF # "$(APP9HEAP)"==""
1660	.ENDIF # "$(GUI)"=="WNT"	1768	.ENDIF # "$(GUI)"=="WNT"
1661		1769
Lines 1745-1753 Link Here
1745	@echo ------------------------------	1853	@echo ------------------------------
1746	@echo Making Module-Definitionfile : $@	1854	@echo Making Module-Definitionfile : $@
1747	@echo LIBRARY $(SHL10TARGET) >$@	1855	@echo LIBRARY $(SHL10TARGET) >$@
		1856	.IF "$(COM)"!="GCC"
1748	@echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@	1857	@echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@
1749	@echo DATA READ WRITE SHARED >>$@	1858	@echo DATA READ WRITE SHARED >>$@
1750	@echo HEAPSIZE 0 >>$@	1859	@echo HEAPSIZE 0 >>$@
		1860	.ENDIF
1751	@echo EXPORTS >>$@	1861	@echo EXPORTS >>$@
1752	# getversioninfo fuer alle!!	1862	# getversioninfo fuer alle!!
1753	@echo GetVersionInfo >>$@	1863	@echo GetVersionInfo >>$@
Lines 1755-1760 Link Here
1755	@echo component_getDescriptionFunc >>$@	1865	@echo component_getDescriptionFunc >>$@
1756	.ENDIF # "$(NO_SHL10DESCRIPTION)"==""	1866	.ENDIF # "$(NO_SHL10DESCRIPTION)"==""
1757	.IF "$(DEFLIB10NAME)"!=""	1867	.IF "$(DEFLIB10NAME)"!=""
		1868	.IF "$(COM)"=="GCC"
		1869	dlltool --output-def $(SHL10TARGET).exp --export-all-symbols \
		1870	`$(TYPE) $(SLB)$/$(DEFLIB10NAME).lib \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`
		1871	tail --lines +3 $(SHL10TARGET).exp >>$@
		1872	.ELSE
1758	@+$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib	1873	@+$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
1759	.IF "$(USE_LDUMP2)"=!""	1874	.IF "$(USE_LDUMP2)"=!""
1760	.IF "$(DEF10CEXP)"!=""	1875	.IF "$(DEF10CEXP)"!=""
Lines 1765-1770 Link Here
1765	.ELSE # "$(USE_LDUMP2)"=!""	1880	.ELSE # "$(USE_LDUMP2)"=!""
1766	@+$(EXPORT10_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp >>$@	1881	@+$(EXPORT10_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp >>$@
1767	.ENDIF # "$(USE_LDUMP2)"=!""	1882	.ENDIF # "$(USE_LDUMP2)"=!""
		1883	.ENDIF
1768	+$(EXPORT10_PROTECT) $(RM) $(SHL10TARGET).exp	1884	+$(EXPORT10_PROTECT) $(RM) $(SHL10TARGET).exp
1769	# now *\defs\$(OUTPATH) exists, commit it	1885	# now *\defs\$(OUTPATH) exists, commit it
1770	.IF "$(BUILD_SOSL)"==""	1886	.IF "$(BUILD_SOSL)"==""
Lines 1840-1847 Link Here
1840	@echo $(DEF10EXPORT20) >>$@	1956	@echo $(DEF10EXPORT20) >>$@
1841	.ENDIF	1957	.ENDIF
1842	.IF "$(DEF10EXPORTFILE)"!=""	1958	.IF "$(DEF10EXPORTFILE)"!=""
		1959	.IF "$(COM)"=="GCC"
		1960	+$(TYPE) $(DEF10EXPORTFILE) \| sed -e s:PRIVATE:: >> $@
		1961	.ELSE
1843	+$(TYPE) $(DEF10EXPORTFILE) >> $@	1962	+$(TYPE) $(DEF10EXPORTFILE) >> $@
1844	.ENDIF	1963	.ENDIF
		1964	.ENDIF
1845	.ENDIF # "$(APP10HEAP)"==""	1965	.ENDIF # "$(APP10HEAP)"==""
1846	.ENDIF # "$(GUI)"=="WNT"	1966	.ENDIF # "$(GUI)"=="WNT"
1847		1967

Lines 113-118 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_app.mk.orig (-2 / +25 lines)
113	.ENDIF	113	.ENDIF
114	.ENDIF	114	.ENDIF
115		115
		116	APP$(TNR)RESO=
		117	.IF "$(GUI)$(COM)" == "WNTGCC"
		118	.IF "$(APP$(TNR)LINKRES)" != "" \|\| "$(APP$(TNR)RES)" != ""
		119	APP$(TNR)RESO=$(MISC)$/$(APP$(TNR)TARGET)_res.o
		120	.ENDIF
		121	.ENDIF
		122
116	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	123	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
117	USE_APP$(TNR)DEF=$(APP$(TNR)DEF)	124	USE_APP$(TNR)DEF=$(APP$(TNR)DEF)
118	.ELSE	125	.ELSE
Lines 197-203 Link Here
197	.ENDIF	204	.ENDIF
198	.ELSE # "$(USE_SHELL)"=="4nt"	205	.ELSE # "$(USE_SHELL)"=="4nt"
199	.IF "$(APP$(TNR)ICON)" != ""	206	.IF "$(APP$(TNR)ICON)" != ""
200	@-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc	207	@-+$(WRAPCMD) echo 1 ICON \"$(APP$(TNR)ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
201	.ENDIF	208	.ENDIF
202	.IF "$(APP$(TNR)VERINFO)" != ""	209	.IF "$(APP$(TNR)VERINFO)" != ""
203	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc	210	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
Lines 206-211 Link Here
206	.ENDIF # "$(USE_SHELL)"=="4nt"	213	.ENDIF # "$(USE_SHELL)"=="4nt"
207	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc	214	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
208	.ENDIF # "$(APP$(TNR)LINKRES)" != ""	215	.ENDIF # "$(APP$(TNR)LINKRES)" != ""
		216	.IF "$(COM)" == "GCC"
		217	@+echo mingw
		218	.IF "$(APP$(TNR)LINKRES)" != "" \|\| "$(APP$(TNR)RES)" != ""
		219	@cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.RES
		220	windres $(MISC)$/$(@:b)_all.RES $(APP$(TNR)RESO)
		221	.ENDIF
		222	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		223	$(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
		224	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
		225	`$(TYPE) /dev/null $(APP$(TNR)LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		226	$(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(@:b).cmd
		227	@+$(TYPE) $(MISC)$/$(@:b).cmd
		228	@+source $(MISC)$/$(@:b).cmd
		229	@ls -l $@
		230	.ELSE
209	.IF "$(linkinc)" == ""	231	.IF "$(linkinc)" == ""
210	$(LINK) @$(mktmp \	232	$(LINK) @$(mktmp \
211	$(LINKFLAGS) \	233	$(LINKFLAGS) \
Lines 242-249 Link Here
242	+if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst >> $(MISC)\$(APP$(TNR)TARGET).lnk	264	+if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst >> $(MISC)\$(APP$(TNR)TARGET).lnk
243	$(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk	265	$(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk
244	.ENDIF # "$(linkinc)" == ""	266	.ENDIF # "$(linkinc)" == ""
		267	.ENDIF
245	.IF "$(APP$(TNR)TARGET)" == "loader"	268	.IF "$(APP$(TNR)TARGET)" == "loader"
246	+$(PERL) loader.pl $@	269	+$(PERL) $(PRJ)$/util$/loader.pl $@
247	.IF "$(USE_SHELL)"=="4nt"	270	.IF "$(USE_SHELL)"=="4nt"
248	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	271	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
249	.ELSE # "$(USE_SHELL)"=="4nt"	272	.ELSE # "$(USE_SHELL)"=="4nt"

Lines 18-23 Link Here

(-)oo_1.1.1_src/solenv/inc/_tg_app.mk.orig (-20 / +250 lines)
18	.ENDIF	18	.ENDIF
19	.ENDIF	19	.ENDIF
20		20
		21	APP1RESO=
		22	.IF "$(GUI)$(COM)" == "WNTGCC"
		23	.IF "$(APP1LINKRES)" != "" \|\| "$(APP1RES)" != ""
		24	APP1RESO=$(MISC)$/$(APP1TARGET:b)_res.o
		25	.ENDIF
		26	.ENDIF
		27
21	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	28	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
22	USE_APP1DEF=$(APP1DEF)	29	USE_APP1DEF=$(APP1DEF)
23	.ELSE	30	.ELSE
Lines 102-108 Link Here
102	.ENDIF	109	.ENDIF
103	.ELSE # "$(USE_SHELL)"=="4nt"	110	.ELSE # "$(USE_SHELL)"=="4nt"
104	.IF "$(APP1ICON)" != ""	111	.IF "$(APP1ICON)" != ""
105	@-+guw.pl echo 1 ICON \"$(APP1ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc	112	@-+$(WRAPCMD) echo 1 ICON \"$(APP1ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc
106	.ENDIF	113	.ENDIF
107	.IF "$(APP1VERINFO)" != ""	114	.IF "$(APP1VERINFO)" != ""
108	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc	115	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
Lines 111-116 Link Here
111	.ENDIF # "$(USE_SHELL)"=="4nt"	118	.ENDIF # "$(USE_SHELL)"=="4nt"
112	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc	119	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
113	.ENDIF # "$(APP1LINKRES)" != ""	120	.ENDIF # "$(APP1LINKRES)" != ""
		121	.IF "$(COM)" == "GCC"
		122	@+echo mingw
		123	.IF "$(APP1LINKRES)" != "" \|\| "$(APP1RES)" != ""
		124	@cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.RES
		125	windres $(MISC)$/$(@:b)_all.RES $(APP1RESO)
		126	.ENDIF
		127	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		128	$(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
		129	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \
		130	`$(TYPE) /dev/null $(APP1LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		131	$(APP_LINKTYPE) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) > $(MISC)$/$(@:b).cmd
		132	@+$(TYPE) $(MISC)$/$(@:b).cmd
		133	@+source $(MISC)$/$(@:b).cmd
		134	@ls -l $@
		135	.ELSE
114	.IF "$(linkinc)" == ""	136	.IF "$(linkinc)" == ""
115	$(LINK) @$(mktmp \	137	$(LINK) @$(mktmp \
116	$(LINKFLAGS) \	138	$(LINKFLAGS) \
Lines 147-154 Link Here
147	+if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst >> $(MISC)\$(APP1TARGET).lnk	169	+if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst >> $(MISC)\$(APP1TARGET).lnk
148	$(LINK) @$(MISC)\$(APP1TARGET).lnk	170	$(LINK) @$(MISC)\$(APP1TARGET).lnk
149	.ENDIF # "$(linkinc)" == ""	171	.ENDIF # "$(linkinc)" == ""
		172	.ENDIF
150	.IF "$(APP1TARGET)" == "loader"	173	.IF "$(APP1TARGET)" == "loader"
151	+$(PERL) loader.pl $@	174	+$(PERL) $(PRJ)$/util$/loader.pl $@
152	.IF "$(USE_SHELL)"=="4nt"	175	.IF "$(USE_SHELL)"=="4nt"
153	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	176	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
154	.ELSE # "$(USE_SHELL)"=="4nt"	177	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 210-215 Link Here
210	.ENDIF	233	.ENDIF
211	.ENDIF	234	.ENDIF
212		235
		236	APP2RESO=
		237	.IF "$(GUI)$(COM)" == "WNTGCC"
		238	.IF "$(APP2LINKRES)" != "" \|\| "$(APP2RES)" != ""
		239	APP2RESO=$(MISC)$/$(APP2TARGET:b)_res.o
		240	.ENDIF
		241	.ENDIF
		242
213	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	243	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
214	USE_APP2DEF=$(APP2DEF)	244	USE_APP2DEF=$(APP2DEF)
215	.ELSE	245	.ELSE
Lines 294-300 Link Here
294	.ENDIF	324	.ENDIF
295	.ELSE # "$(USE_SHELL)"=="4nt"	325	.ELSE # "$(USE_SHELL)"=="4nt"
296	.IF "$(APP2ICON)" != ""	326	.IF "$(APP2ICON)" != ""
297	@-+guw.pl echo 1 ICON \"$(APP2ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc	327	@-+$(WRAPCMD) echo 1 ICON \"$(APP2ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc
298	.ENDIF	328	.ENDIF
299	.IF "$(APP2VERINFO)" != ""	329	.IF "$(APP2VERINFO)" != ""
300	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc	330	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
Lines 303-308 Link Here
303	.ENDIF # "$(USE_SHELL)"=="4nt"	333	.ENDIF # "$(USE_SHELL)"=="4nt"
304	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc	334	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
305	.ENDIF # "$(APP2LINKRES)" != ""	335	.ENDIF # "$(APP2LINKRES)" != ""
		336	.IF "$(COM)" == "GCC"
		337	@+echo mingw
		338	.IF "$(APP2LINKRES)" != "" \|\| "$(APP2RES)" != ""
		339	@cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.RES
		340	windres $(MISC)$/$(@:b)_all.RES $(APP2RESO)
		341	.ENDIF
		342	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		343	$(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
		344	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \
		345	`$(TYPE) /dev/null $(APP2LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		346	$(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) > $(MISC)$/$(@:b).cmd
		347	@+$(TYPE) $(MISC)$/$(@:b).cmd
		348	@+source $(MISC)$/$(@:b).cmd
		349	@ls -l $@
		350	.ELSE
306	.IF "$(linkinc)" == ""	351	.IF "$(linkinc)" == ""
307	$(LINK) @$(mktmp \	352	$(LINK) @$(mktmp \
308	$(LINKFLAGS) \	353	$(LINKFLAGS) \
Lines 339-346 Link Here
339	+if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst >> $(MISC)\$(APP2TARGET).lnk	384	+if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst >> $(MISC)\$(APP2TARGET).lnk
340	$(LINK) @$(MISC)\$(APP2TARGET).lnk	385	$(LINK) @$(MISC)\$(APP2TARGET).lnk
341	.ENDIF # "$(linkinc)" == ""	386	.ENDIF # "$(linkinc)" == ""
		387	.ENDIF
342	.IF "$(APP2TARGET)" == "loader"	388	.IF "$(APP2TARGET)" == "loader"
343	+$(PERL) loader.pl $@	389	+$(PERL) $(PRJ)$/util$/loader.pl $@
344	.IF "$(USE_SHELL)"=="4nt"	390	.IF "$(USE_SHELL)"=="4nt"
345	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	391	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
346	.ELSE # "$(USE_SHELL)"=="4nt"	392	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 402-407 Link Here
402	.ENDIF	448	.ENDIF
403	.ENDIF	449	.ENDIF
404		450
		451	APP3RESO=
		452	.IF "$(GUI)$(COM)" == "WNTGCC"
		453	.IF "$(APP3LINKRES)" != "" \|\| "$(APP3RES)" != ""
		454	APP3RESO=$(MISC)$/$(APP3TARGET:b)_res.o
		455	.ENDIF
		456	.ENDIF
		457
405	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	458	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
406	USE_APP3DEF=$(APP3DEF)	459	USE_APP3DEF=$(APP3DEF)
407	.ELSE	460	.ELSE
Lines 486-492 Link Here
486	.ENDIF	539	.ENDIF
487	.ELSE # "$(USE_SHELL)"=="4nt"	540	.ELSE # "$(USE_SHELL)"=="4nt"
488	.IF "$(APP3ICON)" != ""	541	.IF "$(APP3ICON)" != ""
489	@-+guw.pl echo 1 ICON \"$(APP3ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc	542	@-+$(WRAPCMD) echo 1 ICON \"$(APP3ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc
490	.ENDIF	543	.ENDIF
491	.IF "$(APP3VERINFO)" != ""	544	.IF "$(APP3VERINFO)" != ""
492	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc	545	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
Lines 495-500 Link Here
495	.ENDIF # "$(USE_SHELL)"=="4nt"	548	.ENDIF # "$(USE_SHELL)"=="4nt"
496	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc	549	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
497	.ENDIF # "$(APP3LINKRES)" != ""	550	.ENDIF # "$(APP3LINKRES)" != ""
		551	.IF "$(COM)" == "GCC"
		552	@+echo mingw
		553	.IF "$(APP3LINKRES)" != "" \|\| "$(APP3RES)" != ""
		554	@cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.RES
		555	windres $(MISC)$/$(@:b)_all.RES $(APP3RESO)
		556	.ENDIF
		557	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		558	$(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
		559	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \
		560	`$(TYPE) /dev/null $(APP3LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		561	$(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) > $(MISC)$/$(@:b).cmd
		562	@+$(TYPE) $(MISC)$/$(@:b).cmd
		563	@+source $(MISC)$/$(@:b).cmd
		564	@ls -l $@
		565	.ELSE
498	.IF "$(linkinc)" == ""	566	.IF "$(linkinc)" == ""
499	$(LINK) @$(mktmp \	567	$(LINK) @$(mktmp \
500	$(LINKFLAGS) \	568	$(LINKFLAGS) \
Lines 531-538 Link Here
531	+if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst >> $(MISC)\$(APP3TARGET).lnk	599	+if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst >> $(MISC)\$(APP3TARGET).lnk
532	$(LINK) @$(MISC)\$(APP3TARGET).lnk	600	$(LINK) @$(MISC)\$(APP3TARGET).lnk
533	.ENDIF # "$(linkinc)" == ""	601	.ENDIF # "$(linkinc)" == ""
		602	.ENDIF
534	.IF "$(APP3TARGET)" == "loader"	603	.IF "$(APP3TARGET)" == "loader"
535	+$(PERL) loader.pl $@	604	+$(PERL) $(PRJ)$/util$/loader.pl $@
536	.IF "$(USE_SHELL)"=="4nt"	605	.IF "$(USE_SHELL)"=="4nt"
537	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	606	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
538	.ELSE # "$(USE_SHELL)"=="4nt"	607	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 594-599 Link Here
594	.ENDIF	663	.ENDIF
595	.ENDIF	664	.ENDIF
596		665
		666	APP4RESO=
		667	.IF "$(GUI)$(COM)" == "WNTGCC"
		668	.IF "$(APP4LINKRES)" != "" \|\| "$(APP4RES)" != ""
		669	APP4RESO=$(MISC)$/$(APP4TARGET:b)_res.o
		670	.ENDIF
		671	.ENDIF
		672
597	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	673	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
598	USE_APP4DEF=$(APP4DEF)	674	USE_APP4DEF=$(APP4DEF)
599	.ELSE	675	.ELSE
Lines 678-684 Link Here
678	.ENDIF	754	.ENDIF
679	.ELSE # "$(USE_SHELL)"=="4nt"	755	.ELSE # "$(USE_SHELL)"=="4nt"
680	.IF "$(APP4ICON)" != ""	756	.IF "$(APP4ICON)" != ""
681	@-+guw.pl echo 1 ICON \"$(APP4ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc	757	@-+$(WRAPCMD) echo 1 ICON \"$(APP4ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc
682	.ENDIF	758	.ENDIF
683	.IF "$(APP4VERINFO)" != ""	759	.IF "$(APP4VERINFO)" != ""
684	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc	760	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
Lines 687-692 Link Here
687	.ENDIF # "$(USE_SHELL)"=="4nt"	763	.ENDIF # "$(USE_SHELL)"=="4nt"
688	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc	764	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
689	.ENDIF # "$(APP4LINKRES)" != ""	765	.ENDIF # "$(APP4LINKRES)" != ""
		766	.IF "$(COM)" == "GCC"
		767	@+echo mingw
		768	.IF "$(APP4LINKRES)" != "" \|\| "$(APP4RES)" != ""
		769	@cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.RES
		770	windres $(MISC)$/$(@:b)_all.RES $(APP4RESO)
		771	.ENDIF
		772	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		773	$(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
		774	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \
		775	`$(TYPE) /dev/null $(APP4LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		776	$(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) > $(MISC)$/$(@:b).cmd
		777	@+$(TYPE) $(MISC)$/$(@:b).cmd
		778	@+source $(MISC)$/$(@:b).cmd
		779	@ls -l $@
		780	.ELSE
690	.IF "$(linkinc)" == ""	781	.IF "$(linkinc)" == ""
691	$(LINK) @$(mktmp \	782	$(LINK) @$(mktmp \
692	$(LINKFLAGS) \	783	$(LINKFLAGS) \
Lines 723-730 Link Here
723	+if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst >> $(MISC)\$(APP4TARGET).lnk	814	+if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst >> $(MISC)\$(APP4TARGET).lnk
724	$(LINK) @$(MISC)\$(APP4TARGET).lnk	815	$(LINK) @$(MISC)\$(APP4TARGET).lnk
725	.ENDIF # "$(linkinc)" == ""	816	.ENDIF # "$(linkinc)" == ""
		817	.ENDIF
726	.IF "$(APP4TARGET)" == "loader"	818	.IF "$(APP4TARGET)" == "loader"
727	+$(PERL) loader.pl $@	819	+$(PERL) $(PRJ)$/util$/loader.pl $@
728	.IF "$(USE_SHELL)"=="4nt"	820	.IF "$(USE_SHELL)"=="4nt"
729	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	821	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
730	.ELSE # "$(USE_SHELL)"=="4nt"	822	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 786-791 Link Here
786	.ENDIF	878	.ENDIF
787	.ENDIF	879	.ENDIF
788		880
		881	APP5RESO=
		882	.IF "$(GUI)$(COM)" == "WNTGCC"
		883	.IF "$(APP5LINKRES)" != "" \|\| "$(APP5RES)" != ""
		884	APP5RESO=$(MISC)$/$(APP5TARGET:b)_res.o
		885	.ENDIF
		886	.ENDIF
		887
789	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	888	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
790	USE_APP5DEF=$(APP5DEF)	889	USE_APP5DEF=$(APP5DEF)
791	.ELSE	890	.ELSE
Lines 870-876 Link Here
870	.ENDIF	969	.ENDIF
871	.ELSE # "$(USE_SHELL)"=="4nt"	970	.ELSE # "$(USE_SHELL)"=="4nt"
872	.IF "$(APP5ICON)" != ""	971	.IF "$(APP5ICON)" != ""
873	@-+guw.pl echo 1 ICON \"$(APP5ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc	972	@-+$(WRAPCMD) echo 1 ICON \"$(APP5ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc
874	.ENDIF	973	.ENDIF
875	.IF "$(APP5VERINFO)" != ""	974	.IF "$(APP5VERINFO)" != ""
876	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc	975	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
Lines 879-884 Link Here
879	.ENDIF # "$(USE_SHELL)"=="4nt"	978	.ENDIF # "$(USE_SHELL)"=="4nt"
880	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc	979	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
881	.ENDIF # "$(APP5LINKRES)" != ""	980	.ENDIF # "$(APP5LINKRES)" != ""
		981	.IF "$(COM)" == "GCC"
		982	@+echo mingw
		983	.IF "$(APP5LINKRES)" != "" \|\| "$(APP5RES)" != ""
		984	@cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.RES
		985	windres $(MISC)$/$(@:b)_all.RES $(APP5RESO)
		986	.ENDIF
		987	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		988	$(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
		989	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \
		990	`$(TYPE) /dev/null $(APP5LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		991	$(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) > $(MISC)$/$(@:b).cmd
		992	@+$(TYPE) $(MISC)$/$(@:b).cmd
		993	@+source $(MISC)$/$(@:b).cmd
		994	@ls -l $@
		995	.ELSE
882	.IF "$(linkinc)" == ""	996	.IF "$(linkinc)" == ""
883	$(LINK) @$(mktmp \	997	$(LINK) @$(mktmp \
884	$(LINKFLAGS) \	998	$(LINKFLAGS) \
Lines 915-922 Link Here
915	+if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst >> $(MISC)\$(APP5TARGET).lnk	1029	+if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst >> $(MISC)\$(APP5TARGET).lnk
916	$(LINK) @$(MISC)\$(APP5TARGET).lnk	1030	$(LINK) @$(MISC)\$(APP5TARGET).lnk
917	.ENDIF # "$(linkinc)" == ""	1031	.ENDIF # "$(linkinc)" == ""
		1032	.ENDIF
918	.IF "$(APP5TARGET)" == "loader"	1033	.IF "$(APP5TARGET)" == "loader"
919	+$(PERL) loader.pl $@	1034	+$(PERL) $(PRJ)$/util$/loader.pl $@
920	.IF "$(USE_SHELL)"=="4nt"	1035	.IF "$(USE_SHELL)"=="4nt"
921	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	1036	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
922	.ELSE # "$(USE_SHELL)"=="4nt"	1037	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 978-983 Link Here
978	.ENDIF	1093	.ENDIF
979	.ENDIF	1094	.ENDIF
980		1095
		1096	APP6RESO=
		1097	.IF "$(GUI)$(COM)" == "WNTGCC"
		1098	.IF "$(APP6LINKRES)" != "" \|\| "$(APP6RES)" != ""
		1099	APP6RESO=$(MISC)$/$(APP6TARGET:b)_res.o
		1100	.ENDIF
		1101	.ENDIF
		1102
981	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	1103	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
982	USE_APP6DEF=$(APP6DEF)	1104	USE_APP6DEF=$(APP6DEF)
983	.ELSE	1105	.ELSE
Lines 1062-1068 Link Here
1062	.ENDIF	1184	.ENDIF
1063	.ELSE # "$(USE_SHELL)"=="4nt"	1185	.ELSE # "$(USE_SHELL)"=="4nt"
1064	.IF "$(APP6ICON)" != ""	1186	.IF "$(APP6ICON)" != ""
1065	@-+guw.pl echo 1 ICON \"$(APP6ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc	1187	@-+$(WRAPCMD) echo 1 ICON \"$(APP6ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc
1066	.ENDIF	1188	.ENDIF
1067	.IF "$(APP6VERINFO)" != ""	1189	.IF "$(APP6VERINFO)" != ""
1068	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc	1190	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
Lines 1071-1076 Link Here
1071	.ENDIF # "$(USE_SHELL)"=="4nt"	1193	.ENDIF # "$(USE_SHELL)"=="4nt"
1072	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc	1194	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
1073	.ENDIF # "$(APP6LINKRES)" != ""	1195	.ENDIF # "$(APP6LINKRES)" != ""
		1196	.IF "$(COM)" == "GCC"
		1197	@+echo mingw
		1198	.IF "$(APP6LINKRES)" != "" \|\| "$(APP6RES)" != ""
		1199	@cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.RES
		1200	windres $(MISC)$/$(@:b)_all.RES $(APP6RESO)
		1201	.ENDIF
		1202	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1203	$(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
		1204	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \
		1205	`$(TYPE) /dev/null $(APP6LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1206	$(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) > $(MISC)$/$(@:b).cmd
		1207	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1208	@+source $(MISC)$/$(@:b).cmd
		1209	@ls -l $@
		1210	.ELSE
1074	.IF "$(linkinc)" == ""	1211	.IF "$(linkinc)" == ""
1075	$(LINK) @$(mktmp \	1212	$(LINK) @$(mktmp \
1076	$(LINKFLAGS) \	1213	$(LINKFLAGS) \
Lines 1107-1114 Link Here
1107	+if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst >> $(MISC)\$(APP6TARGET).lnk	1244	+if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst >> $(MISC)\$(APP6TARGET).lnk
1108	$(LINK) @$(MISC)\$(APP6TARGET).lnk	1245	$(LINK) @$(MISC)\$(APP6TARGET).lnk
1109	.ENDIF # "$(linkinc)" == ""	1246	.ENDIF # "$(linkinc)" == ""
		1247	.ENDIF
1110	.IF "$(APP6TARGET)" == "loader"	1248	.IF "$(APP6TARGET)" == "loader"
1111	+$(PERL) loader.pl $@	1249	+$(PERL) $(PRJ)$/util$/loader.pl $@
1112	.IF "$(USE_SHELL)"=="4nt"	1250	.IF "$(USE_SHELL)"=="4nt"
1113	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	1251	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
1114	.ELSE # "$(USE_SHELL)"=="4nt"	1252	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 1170-1175 Link Here
1170	.ENDIF	1308	.ENDIF
1171	.ENDIF	1309	.ENDIF
1172		1310
		1311	APP7RESO=
		1312	.IF "$(GUI)$(COM)" == "WNTGCC"
		1313	.IF "$(APP7LINKRES)" != "" \|\| "$(APP7RES)" != ""
		1314	APP7RESO=$(MISC)$/$(APP7TARGET:b)_res.o
		1315	.ENDIF
		1316	.ENDIF
		1317
1173	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	1318	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
1174	USE_APP7DEF=$(APP7DEF)	1319	USE_APP7DEF=$(APP7DEF)
1175	.ELSE	1320	.ELSE
Lines 1254-1260 Link Here
1254	.ENDIF	1399	.ENDIF
1255	.ELSE # "$(USE_SHELL)"=="4nt"	1400	.ELSE # "$(USE_SHELL)"=="4nt"
1256	.IF "$(APP7ICON)" != ""	1401	.IF "$(APP7ICON)" != ""
1257	@-+guw.pl echo 1 ICON \"$(APP7ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc	1402	@-+$(WRAPCMD) echo 1 ICON \"$(APP7ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc
1258	.ENDIF	1403	.ENDIF
1259	.IF "$(APP7VERINFO)" != ""	1404	.IF "$(APP7VERINFO)" != ""
1260	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc	1405	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
Lines 1263-1268 Link Here
1263	.ENDIF # "$(USE_SHELL)"=="4nt"	1408	.ENDIF # "$(USE_SHELL)"=="4nt"
1264	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc	1409	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
1265	.ENDIF # "$(APP7LINKRES)" != ""	1410	.ENDIF # "$(APP7LINKRES)" != ""
		1411	.IF "$(COM)" == "GCC"
		1412	@+echo mingw
		1413	.IF "$(APP7LINKRES)" != "" \|\| "$(APP7RES)" != ""
		1414	@cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.RES
		1415	windres $(MISC)$/$(@:b)_all.RES $(APP7RESO)
		1416	.ENDIF
		1417	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1418	$(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
		1419	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \
		1420	`$(TYPE) /dev/null $(APP7LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1421	$(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) > $(MISC)$/$(@:b).cmd
		1422	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1423	@+source $(MISC)$/$(@:b).cmd
		1424	@ls -l $@
		1425	.ELSE
1266	.IF "$(linkinc)" == ""	1426	.IF "$(linkinc)" == ""
1267	$(LINK) @$(mktmp \	1427	$(LINK) @$(mktmp \
1268	$(LINKFLAGS) \	1428	$(LINKFLAGS) \
Lines 1299-1306 Link Here
1299	+if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst >> $(MISC)\$(APP7TARGET).lnk	1459	+if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst >> $(MISC)\$(APP7TARGET).lnk
1300	$(LINK) @$(MISC)\$(APP7TARGET).lnk	1460	$(LINK) @$(MISC)\$(APP7TARGET).lnk
1301	.ENDIF # "$(linkinc)" == ""	1461	.ENDIF # "$(linkinc)" == ""
		1462	.ENDIF
1302	.IF "$(APP7TARGET)" == "loader"	1463	.IF "$(APP7TARGET)" == "loader"
1303	+$(PERL) loader.pl $@	1464	+$(PERL) $(PRJ)$/util$/loader.pl $@
1304	.IF "$(USE_SHELL)"=="4nt"	1465	.IF "$(USE_SHELL)"=="4nt"
1305	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	1466	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
1306	.ELSE # "$(USE_SHELL)"=="4nt"	1467	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 1362-1367 Link Here
1362	.ENDIF	1523	.ENDIF
1363	.ENDIF	1524	.ENDIF
1364		1525
		1526	APP8RESO=
		1527	.IF "$(GUI)$(COM)" == "WNTGCC"
		1528	.IF "$(APP8LINKRES)" != "" \|\| "$(APP8RES)" != ""
		1529	APP8RESO=$(MISC)$/$(APP8TARGET:b)_res.o
		1530	.ENDIF
		1531	.ENDIF
		1532
1365	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	1533	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
1366	USE_APP8DEF=$(APP8DEF)	1534	USE_APP8DEF=$(APP8DEF)
1367	.ELSE	1535	.ELSE
Lines 1446-1452 Link Here
1446	.ENDIF	1614	.ENDIF
1447	.ELSE # "$(USE_SHELL)"=="4nt"	1615	.ELSE # "$(USE_SHELL)"=="4nt"
1448	.IF "$(APP8ICON)" != ""	1616	.IF "$(APP8ICON)" != ""
1449	@-+guw.pl echo 1 ICON \"$(APP8ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc	1617	@-+$(WRAPCMD) echo 1 ICON \"$(APP8ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc
1450	.ENDIF	1618	.ENDIF
1451	.IF "$(APP8VERINFO)" != ""	1619	.IF "$(APP8VERINFO)" != ""
1452	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc	1620	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
Lines 1455-1460 Link Here
1455	.ENDIF # "$(USE_SHELL)"=="4nt"	1623	.ENDIF # "$(USE_SHELL)"=="4nt"
1456	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc	1624	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
1457	.ENDIF # "$(APP8LINKRES)" != ""	1625	.ENDIF # "$(APP8LINKRES)" != ""
		1626	.IF "$(COM)" == "GCC"
		1627	@+echo mingw
		1628	.IF "$(APP8LINKRES)" != "" \|\| "$(APP8RES)" != ""
		1629	@cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.RES
		1630	windres $(MISC)$/$(@:b)_all.RES $(APP8RESO)
		1631	.ENDIF
		1632	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1633	$(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
		1634	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \
		1635	`$(TYPE) /dev/null $(APP8LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1636	$(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) > $(MISC)$/$(@:b).cmd
		1637	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1638	@+source $(MISC)$/$(@:b).cmd
		1639	@ls -l $@
		1640	.ELSE
1458	.IF "$(linkinc)" == ""	1641	.IF "$(linkinc)" == ""
1459	$(LINK) @$(mktmp \	1642	$(LINK) @$(mktmp \
1460	$(LINKFLAGS) \	1643	$(LINKFLAGS) \
Lines 1491-1498 Link Here
1491	+if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst >> $(MISC)\$(APP8TARGET).lnk	1674	+if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst >> $(MISC)\$(APP8TARGET).lnk
1492	$(LINK) @$(MISC)\$(APP8TARGET).lnk	1675	$(LINK) @$(MISC)\$(APP8TARGET).lnk
1493	.ENDIF # "$(linkinc)" == ""	1676	.ENDIF # "$(linkinc)" == ""
		1677	.ENDIF
1494	.IF "$(APP8TARGET)" == "loader"	1678	.IF "$(APP8TARGET)" == "loader"
1495	+$(PERL) loader.pl $@	1679	+$(PERL) $(PRJ)$/util$/loader.pl $@
1496	.IF "$(USE_SHELL)"=="4nt"	1680	.IF "$(USE_SHELL)"=="4nt"
1497	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	1681	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
1498	.ELSE # "$(USE_SHELL)"=="4nt"	1682	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 1554-1559 Link Here
1554	.ENDIF	1738	.ENDIF
1555	.ENDIF	1739	.ENDIF
1556		1740
		1741	APP9RESO=
		1742	.IF "$(GUI)$(COM)" == "WNTGCC"
		1743	.IF "$(APP9LINKRES)" != "" \|\| "$(APP9RES)" != ""
		1744	APP9RESO=$(MISC)$/$(APP9TARGET:b)_res.o
		1745	.ENDIF
		1746	.ENDIF
		1747
1557	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	1748	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
1558	USE_APP9DEF=$(APP9DEF)	1749	USE_APP9DEF=$(APP9DEF)
1559	.ELSE	1750	.ELSE
Lines 1638-1644 Link Here
1638	.ENDIF	1829	.ENDIF
1639	.ELSE # "$(USE_SHELL)"=="4nt"	1830	.ELSE # "$(USE_SHELL)"=="4nt"
1640	.IF "$(APP9ICON)" != ""	1831	.IF "$(APP9ICON)" != ""
1641	@-+guw.pl echo 1 ICON \"$(APP9ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc	1832	@-+$(WRAPCMD) echo 1 ICON \"$(APP9ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc
1642	.ENDIF	1833	.ENDIF
1643	.IF "$(APP9VERINFO)" != ""	1834	.IF "$(APP9VERINFO)" != ""
1644	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc	1835	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
Lines 1647-1652 Link Here
1647	.ENDIF # "$(USE_SHELL)"=="4nt"	1838	.ENDIF # "$(USE_SHELL)"=="4nt"
1648	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc	1839	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
1649	.ENDIF # "$(APP9LINKRES)" != ""	1840	.ENDIF # "$(APP9LINKRES)" != ""
		1841	.IF "$(COM)" == "GCC"
		1842	@+echo mingw
		1843	.IF "$(APP9LINKRES)" != "" \|\| "$(APP9RES)" != ""
		1844	@cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.RES
		1845	windres $(MISC)$/$(@:b)_all.RES $(APP9RESO)
		1846	.ENDIF
		1847	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1848	$(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
		1849	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \
		1850	`$(TYPE) /dev/null $(APP9LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1851	$(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) > $(MISC)$/$(@:b).cmd
		1852	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1853	@+source $(MISC)$/$(@:b).cmd
		1854	@ls -l $@
		1855	.ELSE
1650	.IF "$(linkinc)" == ""	1856	.IF "$(linkinc)" == ""
1651	$(LINK) @$(mktmp \	1857	$(LINK) @$(mktmp \
1652	$(LINKFLAGS) \	1858	$(LINKFLAGS) \
Lines 1683-1690 Link Here
1683	+if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst >> $(MISC)\$(APP9TARGET).lnk	1889	+if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst >> $(MISC)\$(APP9TARGET).lnk
1684	$(LINK) @$(MISC)\$(APP9TARGET).lnk	1890	$(LINK) @$(MISC)\$(APP9TARGET).lnk
1685	.ENDIF # "$(linkinc)" == ""	1891	.ENDIF # "$(linkinc)" == ""
		1892	.ENDIF
1686	.IF "$(APP9TARGET)" == "loader"	1893	.IF "$(APP9TARGET)" == "loader"
1687	+$(PERL) loader.pl $@	1894	+$(PERL) $(PRJ)$/util$/loader.pl $@
1688	.IF "$(USE_SHELL)"=="4nt"	1895	.IF "$(USE_SHELL)"=="4nt"
1689	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	1896	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
1690	.ELSE # "$(USE_SHELL)"=="4nt"	1897	.ELSE # "$(USE_SHELL)"=="4nt"
Lines 1746-1751 Link Here
1746	.ENDIF	1953	.ENDIF
1747	.ENDIF	1954	.ENDIF
1748		1955
		1956	APP10RESO=
		1957	.IF "$(GUI)$(COM)" == "WNTGCC"
		1958	.IF "$(APP10LINKRES)" != "" \|\| "$(APP10RES)" != ""
		1959	APP10RESO=$(MISC)$/$(APP10TARGET:b)_res.o
		1960	.ENDIF
		1961	.ENDIF
		1962
1749	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	1963	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
1750	USE_APP10DEF=$(APP10DEF)	1964	USE_APP10DEF=$(APP10DEF)
1751	.ELSE	1965	.ELSE
Lines 1830-1836 Link Here
1830	.ENDIF	2044	.ENDIF
1831	.ELSE # "$(USE_SHELL)"=="4nt"	2045	.ELSE # "$(USE_SHELL)"=="4nt"
1832	.IF "$(APP10ICON)" != ""	2046	.IF "$(APP10ICON)" != ""
1833	@-+guw.pl echo 1 ICON \"$(APP10ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc	2047	@-+$(WRAPCMD) echo 1 ICON \"$(APP10ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc
1834	.ENDIF	2048	.ENDIF
1835	.IF "$(APP10VERINFO)" != ""	2049	.IF "$(APP10VERINFO)" != ""
1836	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc	2050	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
Lines 1839-1844 Link Here
1839	.ENDIF # "$(USE_SHELL)"=="4nt"	2053	.ENDIF # "$(USE_SHELL)"=="4nt"
1840	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc	2054	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
1841	.ENDIF # "$(APP10LINKRES)" != ""	2055	.ENDIF # "$(APP10LINKRES)" != ""
		2056	.IF "$(COM)" == "GCC"
		2057	@+echo mingw
		2058	.IF "$(APP10LINKRES)" != "" \|\| "$(APP10RES)" != ""
		2059	@cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.RES
		2060	windres $(MISC)$/$(@:b)_all.RES $(APP10RESO)
		2061	.ENDIF
		2062	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		2063	$(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
		2064	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \
		2065	`$(TYPE) /dev/null $(APP10LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		2066	$(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) > $(MISC)$/$(@:b).cmd
		2067	@+$(TYPE) $(MISC)$/$(@:b).cmd
		2068	@+source $(MISC)$/$(@:b).cmd
		2069	@ls -l $@
		2070	.ELSE
1842	.IF "$(linkinc)" == ""	2071	.IF "$(linkinc)" == ""
1843	$(LINK) @$(mktmp \	2072	$(LINK) @$(mktmp \
1844	$(LINKFLAGS) \	2073	$(LINKFLAGS) \
Lines 1875-1882 Link Here
1875	+if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst >> $(MISC)\$(APP10TARGET).lnk	2104	+if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst >> $(MISC)\$(APP10TARGET).lnk
1876	$(LINK) @$(MISC)\$(APP10TARGET).lnk	2105	$(LINK) @$(MISC)\$(APP10TARGET).lnk
1877	.ENDIF # "$(linkinc)" == ""	2106	.ENDIF # "$(linkinc)" == ""
		2107	.ENDIF
1878	.IF "$(APP10TARGET)" == "loader"	2108	.IF "$(APP10TARGET)" == "loader"
1879	+$(PERL) loader.pl $@	2109	+$(PERL) $(PRJ)$/util$/loader.pl $@
1880	.IF "$(USE_SHELL)"=="4nt"	2110	.IF "$(USE_SHELL)"=="4nt"
1881	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe	2111	+$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
1882	.ELSE # "$(USE_SHELL)"=="4nt"	2112	.ELSE # "$(USE_SHELL)"=="4nt"

Lines 790-797 Link Here

(-)oo_1.1.1_src/solenv/inc/settings.mk.orig (-13 / +36 lines)
790	.ENDIF # "$(GUI)"=="WNT"	790	.ENDIF # "$(GUI)"=="WNT"
791		791
792	.IF "$(GUI)"=="WNT"	792	.IF "$(GUI)"=="WNT"
		793	.IF "$(COM)"=="GCC"
		794	SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32
		795	.ELSE
793	SHELLLIB=$(LIBPRE) gdi32.lib $(LIBPRE) shell32.lib $(LIBPRE) advapi32.lib $(LIBPRE) comdlg32.lib	796	SHELLLIB=$(LIBPRE) gdi32.lib $(LIBPRE) shell32.lib $(LIBPRE) advapi32.lib $(LIBPRE) comdlg32.lib
794	.ENDIF	797	.ENDIF
		798	.ENDIF
795	.IF "$(GUI)"=="WIN"	799	.IF "$(GUI)"=="WIN"
796	SHELLLIB=$(LIBPRE) shell.lib	800	SHELLLIB=$(LIBPRE) shell.lib
797	.ENDIF	801	.ENDIF
Lines 1105-1111 Link Here
1105	SVIDL=svidl	1109	SVIDL=svidl
1106	.ELSE	1110	.ELSE
1107	.IF "$(USE_SHELL)"!="4nt"	1111	.IF "$(USE_SHELL)"!="4nt"
1108	SVIDL=guw.pl svidl.exe	1112	SVIDL=$(WRAPCMD) svidl.exe
1109	.ELSE	1113	.ELSE
1110	SVIDL=svidl.exe	1114	SVIDL=svidl.exe
1111	.ENDIF	1115	.ENDIF
Lines 1117-1124 Link Here
1117	.ENDIF	1121	.ENDIF
1118	.ELSE	1122	.ELSE
1119	.IF "$(USE_SHELL)"!="4nt"	1123	.IF "$(USE_SHELL)"!="4nt"
1120	LDUMP=guw.pl ldump4	1124	LDUMP=$(WRAPCMD) ldump4
1121	LDUMP2=guw.pl ldump4	1125	LDUMP2=$(WRAPCMD) ldump4
1122	.ELSE	1126	.ELSE
1123	LDUMP=ldump4	1127	LDUMP=ldump4
1124	LDUMP2=ldump4	1128	LDUMP2=ldump4
Lines 1160-1173 Link Here
1160	RSC=rscdep	1164	RSC=rscdep
1161	.IF "$(GUI)"=="WNT"	1165	.IF "$(GUI)"=="WNT"
1162	.IF "$(USE_SHELL)"!="4nt"	1166	.IF "$(USE_SHELL)"!="4nt"
1163	RSC=guw.pl rscdep	1167	RSC=$(WRAPCMD) rscdep
1164	.ENDIF	1168	.ENDIF
1165	.ENDIF	1169	.ENDIF
1166	.ELSE	1170	.ELSE
1167	RSC=rsc	1171	RSC=rsc
1168	.IF "$(GUI)"=="WNT"	1172	.IF "$(GUI)"=="WNT"
1169	.IF "$(USE_SHELL)"!="4nt"	1173	.IF "$(USE_SHELL)"!="4nt"
1170	RSC=guw.pl rsc	1174	RSC=$(WRAPCMD) rsc
1171	.ENDIF	1175	.ENDIF
1172	.ENDIF	1176	.ENDIF
1173	.ENDIF	1177	.ENDIF
Lines 1377-1382 Link Here
1377	.ENDIF	1381	.ENDIF
1378	.ENDIF	1382	.ENDIF
1379	.ENDIF # "$(PRJPCH)"!=""	1383	.ENDIF # "$(PRJPCH)"!=""
		1384
		1385	STDLIB=
		1386	STDSHL=
		1387
		1388	.IF "$(GUI)$(COM)"=="WNTGCC"
		1389	.IF "$(NO_DEFAULT_STL)"==""
		1390	STDLIB+=$(LIBSTLPORT)
		1391	STDSHL+=$(LIBSTLPORT)
		1392	.ELSE
		1393	STDLIB+=$(STDLIBCPP)
		1394	STDSHL+=$(STDLIBCPP)
		1395	.ENDIF # "$(NO_DEFAULT_STL)"==""
		1396	.ENDIF
		1397
1380	#	1398	#
1381	# Zusammenbau der Flags und CDefs fuer GUI	1399	# Zusammenbau der Flags und CDefs fuer GUI
1382	.IF "$(TARGETTYPE)"=="GUI"	1400	.IF "$(TARGETTYPE)"=="GUI"
Lines 1391-1403 Link Here
1391	.IF "$(TARGETTHREAD)"=="MT"	1409	.IF "$(TARGETTHREAD)"=="MT"
1392	CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT)	1410	CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT)
1393	CFLAGSOBJ+=$(CFLAGSOBJGUIMT)	1411	CFLAGSOBJ+=$(CFLAGSOBJGUIMT)
1394	STDLIB=$(STDLIBGUIMT)	1412	STDLIB+=$(STDLIBGUIMT)
1395	STDSHL=$(STDSHLGUIMT)	1413	STDSHL+=$(STDSHLGUIMT)
1396	.ELSE	1414	.ELSE
1397	CDEFSOBJ+= $(CDEFSST) $(CDEFSOBJST)	1415	CDEFSOBJ+= $(CDEFSST) $(CDEFSOBJST)
1398	CFLAGSOBJ+=$(CFLAGSOBJGUIST)	1416	CFLAGSOBJ+=$(CFLAGSOBJGUIST)
1399	STDLIB=$(STDLIBGUIST)	1417	STDLIB+=$(STDLIBGUIST)
1400	STDSHL=$(STDSHLGUIST)	1418	STDSHL+=$(STDSHLGUIST)
1401	.ENDIF	1419	.ENDIF
1402		1420
1403	.ENDIF	1421	.ENDIF
Lines 1415-1435 Link Here
1415	.IF "$(TARGETTHREAD)" == "MT" \|\| "$(TARGETTHREAD)"=="mt"	1433	.IF "$(TARGETTHREAD)" == "MT" \|\| "$(TARGETTHREAD)"=="mt"
1416	CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT)	1434	CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT)
1417	CFLAGSOBJ+=$(CFLAGSOBJCUIMT)	1435	CFLAGSOBJ+=$(CFLAGSOBJCUIMT)
1418	STDLIB=$(STDLIBCUIMT)	1436	STDLIB+=$(STDLIBCUIMT)
1419	STDSHL=$(STDSHLCUIMT)	1437	STDSHL+=$(STDSHLCUIMT)
1420	.ELSE	1438	.ELSE
1421	CDEFSOBJ+=$(CDEFSST) $(CDEFSOBJST)	1439	CDEFSOBJ+=$(CDEFSST) $(CDEFSOBJST)
1422	CFLAGSOBJ+=$(CFLAGSOBJCUIST)	1440	CFLAGSOBJ+=$(CFLAGSOBJCUIST)
1423	STDLIB=$(STDLIBCUIST)	1441	STDLIB+=$(STDLIBCUIST)
1424	STDSHL=$(STDSHLCUIST)	1442	STDSHL+=$(STDSHLCUIST)
1425	.ENDIF	1443	.ENDIF
1426		1444
1427	.ENDIF	1445	.ENDIF
1428		1446
		1447	.IF "$(GUI)$(COM)"!="WNTGCC"
1429	.IF "$(NO_DEFAULT_STL)"==""	1448	.IF "$(NO_DEFAULT_STL)"==""
1430	STDLIB+=$(LIBSTLPORT)	1449	STDLIB+=$(LIBSTLPORT)
1431	STDSHL+=$(LIBSTLPORT)	1450	STDSHL+=$(LIBSTLPORT)
		1451	.ELSE
		1452	STDLIB+=$(STDLIBCPP)
		1453	STDSHL+=$(STDLIBCPP)
1432	.ENDIF # "$(NO_DEFAULT_STL)"==""	1454	.ENDIF # "$(NO_DEFAULT_STL)"==""
		1455	.ENDIF
1433		1456
1434	# fill up unresolved symbols not found else where	1457	# fill up unresolved symbols not found else where
1435	.IF "$(FILLUPARC)"!=""	1458	.IF "$(FILLUPARC)"!=""





.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL1IMPLIB)" != ""
USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib
.ELSE			# "$(SHL1IMPLIB)" != ""

SHL1RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL1RES))
SHL1ALLRES+=$(SHL1RES)
SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
.ENDIF			# "$(SHL1RES)"!=""
.ENDIF


SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res
SHL1ALLRES+=$(SHL1DEFAULTRES)
SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
.ENDIF			# "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL1DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL1LINKRES) $(SHL1LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL1ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
		`$(TYPE) /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL1STDLIBS) $(STDSHL) $(STDSHL1) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL1ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
		`$(TYPE) /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL1TARGET).exp $(SHL1STDLIBS) $(STDSHL) $(STDSHL1) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL1) \
		$(SHL1LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL1BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL1TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL1TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL2IMPLIB)" != ""
USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib
.ELSE			# "$(SHL2IMPLIB)" != ""

SHL2RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL2RES))
SHL2ALLRES+=$(SHL2RES)
SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
.ENDIF			# "$(SHL2RES)"!=""
.ENDIF


SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res
SHL2ALLRES+=$(SHL2DEFAULTRES)
SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
.ENDIF			# "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL2DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL2LINKRES) $(SHL2LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL2ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
		`$(TYPE) /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL2STDLIBS) $(STDSHL) $(STDSHL2) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL2ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
		`$(TYPE) /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL2TARGET).exp $(SHL2STDLIBS) $(STDSHL) $(STDSHL2) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL2) \
		$(SHL2LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL2BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL2TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL2TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL3IMPLIB)" != ""
USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib
.ELSE			# "$(SHL3IMPLIB)" != ""

SHL3RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL3RES))
SHL3ALLRES+=$(SHL3RES)
SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
.ENDIF			# "$(SHL3RES)"!=""
.ENDIF


SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res
SHL3ALLRES+=$(SHL3DEFAULTRES)
SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
.ENDIF			# "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL3DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL3LINKRES) $(SHL3LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL3ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
		`$(TYPE) /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL3STDLIBS) $(STDSHL) $(STDSHL3) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL3ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
		`$(TYPE) /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL3TARGET).exp $(SHL3STDLIBS) $(STDSHL) $(STDSHL3) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL3) \
		$(SHL3LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL3BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL3TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL3TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL4IMPLIB)" != ""
USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib
.ELSE			# "$(SHL4IMPLIB)" != ""

SHL4RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL4RES))
SHL4ALLRES+=$(SHL4RES)
SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
.ENDIF			# "$(SHL4RES)"!=""
.ENDIF


SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res
SHL4ALLRES+=$(SHL4DEFAULTRES)
SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
.ENDIF			# "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL4DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL4LINKRES) $(SHL4LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL4ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
		`$(TYPE) /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL4STDLIBS) $(STDSHL) $(STDSHL4) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL4ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
		`$(TYPE) /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL4TARGET).exp $(SHL4STDLIBS) $(STDSHL) $(STDSHL4) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL4) \
		$(SHL4LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL4BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL4TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL4TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL5IMPLIB)" != ""
USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib
.ELSE			# "$(SHL5IMPLIB)" != ""

SHL5RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL5RES))
SHL5ALLRES+=$(SHL5RES)
SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
.ENDIF			# "$(SHL5RES)"!=""
.ENDIF


SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res
SHL5ALLRES+=$(SHL5DEFAULTRES)
SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
.ENDIF			# "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL5DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL5LINKRES) $(SHL5LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL5ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
		`$(TYPE) /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL5STDLIBS) $(STDSHL) $(STDSHL5) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL5ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
		`$(TYPE) /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL5TARGET).exp $(SHL5STDLIBS) $(STDSHL) $(STDSHL5) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL5) \
		$(SHL5LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL5BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL5TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL5TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL6IMPLIB)" != ""
USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib
.ELSE			# "$(SHL6IMPLIB)" != ""

SHL6RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL6RES))
SHL6ALLRES+=$(SHL6RES)
SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
.ENDIF			# "$(SHL6RES)"!=""
.ENDIF


SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res
SHL6ALLRES+=$(SHL6DEFAULTRES)
SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
.ENDIF			# "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL6DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL6LINKRES) $(SHL6LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL6ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
		`$(TYPE) /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL6STDLIBS) $(STDSHL) $(STDSHL6) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL6ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
		`$(TYPE) /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL6TARGET).exp $(SHL6STDLIBS) $(STDSHL) $(STDSHL6) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL6) \
		$(SHL6LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL6BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL6TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL6TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL7IMPLIB)" != ""
USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib
.ELSE			# "$(SHL7IMPLIB)" != ""

SHL7RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL7RES))
SHL7ALLRES+=$(SHL7RES)
SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
.ENDIF			# "$(SHL7RES)"!=""
.ENDIF


SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res
SHL7ALLRES+=$(SHL7DEFAULTRES)
SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
.ENDIF			# "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL7DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL7LINKRES) $(SHL7LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL7ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
		`$(TYPE) /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL7STDLIBS) $(STDSHL) $(STDSHL7) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL7ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
		`$(TYPE) /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL7TARGET).exp $(SHL7STDLIBS) $(STDSHL) $(STDSHL7) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL7) \
		$(SHL7LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL7BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL7TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL7TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL8IMPLIB)" != ""
USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib
.ELSE			# "$(SHL8IMPLIB)" != ""

SHL8RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL8RES))
SHL8ALLRES+=$(SHL8RES)
SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
.ENDIF			# "$(SHL8RES)"!=""
.ENDIF


SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res
SHL8ALLRES+=$(SHL8DEFAULTRES)
SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
.ENDIF			# "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL8DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL8LINKRES) $(SHL8LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL8ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
		`$(TYPE) /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL8STDLIBS) $(STDSHL) $(STDSHL8) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL8ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
		`$(TYPE) /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL8TARGET).exp $(SHL8STDLIBS) $(STDSHL) $(STDSHL8) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL8) \
		$(SHL8LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL8BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL8TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL8TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL9IMPLIB)" != ""
USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib
.ELSE			# "$(SHL9IMPLIB)" != ""

SHL9RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL9RES))
SHL9ALLRES+=$(SHL9RES)
SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
.ENDIF			# "$(SHL9RES)"!=""
.ENDIF


SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res
SHL9ALLRES+=$(SHL9DEFAULTRES)
SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
.ENDIF			# "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL9DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL9LINKRES) $(SHL9LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL9ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
		`$(TYPE) /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL9STDLIBS) $(STDSHL) $(STDSHL9) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL9ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
		`$(TYPE) /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL9TARGET).exp $(SHL9STDLIBS) $(STDSHL) $(STDSHL9) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL9) \
		$(SHL9LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL9BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL9TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL9TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"


.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL10IMPLIB)" != ""
USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib
.ELSE			# "$(SHL10IMPLIB)" != ""

SHL10RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL10RES))
SHL10ALLRES+=$(SHL10RES)
SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
.ENDIF			# "$(SHL10RES)"!=""
.ENDIF


SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res
SHL10ALLRES+=$(SHL10DEFAULTRES)
SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
.ENDIF			# "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL10DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL10LINKRES) $(SHL10LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL10ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
		`$(TYPE) /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL10STDLIBS) $(STDSHL) $(STDSHL10) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL10ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
		`$(TYPE) /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL10TARGET).exp $(SHL10STDLIBS) $(STDSHL) $(STDSHL10) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL10) \
		$(SHL10LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL10BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL10TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL10TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"

	@echo ------------------------------
	@echo Making: $(SHL1IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL1ARCHIV).a --output-exp $(LB)$/lib$(SHL1TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL1IMPLIBN) \
	-def:$(SHL1DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL1TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL2IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL2ARCHIV).a --output-exp $(LB)$/lib$(SHL2TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL2IMPLIBN) \
	-def:$(SHL2DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL2TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL3IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL3ARCHIV).a --output-exp $(LB)$/lib$(SHL3TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL3IMPLIBN) \
	-def:$(SHL3DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL3TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL4IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL4ARCHIV).a --output-exp $(LB)$/lib$(SHL4TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL4IMPLIBN) \
	-def:$(SHL4DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL4TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL5IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL5ARCHIV).a --output-exp $(LB)$/lib$(SHL5TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL5IMPLIBN) \
	-def:$(SHL5DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL5TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL6IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL6ARCHIV).a --output-exp $(LB)$/lib$(SHL6TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL6IMPLIBN) \
	-def:$(SHL6DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL6TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL7IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL7ARCHIV).a --output-exp $(LB)$/lib$(SHL7TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL7IMPLIBN) \
	-def:$(SHL7DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL7TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL8IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL8ARCHIV).a --output-exp $(LB)$/lib$(SHL8TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL8IMPLIBN) \
	-def:$(SHL8DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL8TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL9IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL9ARCHIV).a --output-exp $(LB)$/lib$(SHL9TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL9IMPLIBN) \
	-def:$(SHL9DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL9TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""

	@echo ------------------------------
	@echo Making: $(SHL10IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL10ARCHIV).a --output-exp $(LB)$/lib$(SHL10TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \

.ELSE			# "$(GUI)" == "WNT"
	+$(TOUCH) $@
	+@echo build of $(SHL10TARGETN) creates $@
.ENDIF
.ENDIF			# "$(GUI)" == "WNT"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"





.IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT"
.IF "$(COM)" != "GCC"
.IF "$(SHL$(TNR)IMPLIB)" != ""
USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib
.ELSE			# "$(SHL$(TNR)IMPLIB)" != ""

SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))
SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)
SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
.ENDIF			# "$(SHL$(TNR)RES)"!=""
.ENDIF


SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res
SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)
SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
.ENDIF			# "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""

.IF "$(NO_SHL$(TNR)DESCRIPTION)"==""

.IF "$(GUI)" == "WNT"
.IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC"
			$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ELSE
			$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
.ENDIF			# "$(COM)"=="GCC"

	+$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)
.ELSE			# "$(USE_SHELL)"=="4nt"
	+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
.IF "$(COM)"=="GCC"
	windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(USE_SHELL)"=="4nt"
.ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
.IF "$(COM)"=="GCC"
.IF "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
		`$(TYPE) /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(MISC)$/$(@:b).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
		`$(TYPE) /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		-Wl,$(LB)$/lib$(SHL$(TNR)TARGET).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
		-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
	@+$(TYPE)  $(MISC)$/$(@:b).cmd
	@+source $(MISC)$/$(@:b).cmd
.ENDIF			# "$(USE_DEFFILE)"!=""
.ELSE
.IF "$(linkinc)"==""
.IF "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp \
		$(LINKFLAGS) \
		$(LINKFLAGSSHL) \

		$(STDSHL) $(STDSHL$(TNR)) \
		$(SHL$(TNR)LINKRES) \
	)
.ENDIF			# "$(COM)"=="GCC"
.ELSE			# "$(USE_DEFFILE)"!=""
	$(LINK) @$(mktmp	$(LINKFLAGS)			\
		$(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\

		+$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
		$(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
.ENDIF			# "$(linkinc)"==""
.ENDIF			# "$(COM)"=="GCC"
.ENDIF			# "$(GUI)" == "WNT"
.IF "$(GUI)"=="UNX"
.IF "$(UPDATER)"=="YES"

	@echo ------------------------------
	@echo Making: $(SHL$(TNR)IMPLIBN)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
	@echo no ImportLibs on mingw
.IF "$(USE_DEFFILE)"==""
	@echo build .a instead
	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).exp
.ENDIF			# "$(USE_DEFFILE)==""
	@+-$(RM) $@
	@$(TOUCH) $@
.ELSE			# "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
	-def:$(SHL$(TNR)DEF) )
.ELSE			# "$(USE_DEFFILE)==""
	+$(TOUCH) $@
	+@echo build of $(SHL$(TNR)TARGETN) creates $@
.ENDIF			# "$(USE_DEFFILE)==""
.ENDIF			# "$(COM)"=="GCC"
.ELSE
.IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2"
.IF "$(USE_DEFFILE)"==""




RCLINKFLAGS=
RCSETVERSION=

ADVAPI32LIB=advapi32.lib
SHELL32LIB=shell32.lib
GDI32LIB=gdi32.lib
OLE32LIB=ole32.lib
OLEAUT32LIB=oleaut32.lib
UUIDLIB=uuid.lib
WINSPOOLLIB=winspool.lib
IMM32LIB=imm32.lib
PSPLIB=apsp.lib
VERSIONLIB=version.lib
WINMMLIB=winmm.lib
WSOCK32LIB=wsock32.lib
MPRLIB=mpr.lib
WS2_32LIB=ws2_32.lib
KERNEL32LIB=kernel32.lib
USER32LIB=user32.lib
MSVCRTLIB=msvcrt.lib
COMDLG32LIB=comdlg32.lib
COMCTL32LIB=comctl32.lib
DBGHELPLIB=dbghelp.lib
PSAPILIB=psapi.lib

DLLPOSTFIX=mi


.IF "$(COM)" == "GCC"
.IF "$(CPU)" == "I"

ASM=ml
AFLAGS=/c /Cp /coff

CXX*=$(WRAPCMD) gcc
### Der gcc vertraegt kein Semikolon im Include-Pfad         RT
# old:
#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) 
# new:
CYGINC=$(INCLUDE:s/-I /-I/:+"  ":s/;/ -I/:s/-I  //:s/   / /)
CFLAGS=-fmessage-length=0 -c -Wall -I$(CYGINC) $(OLE2DEF)

# flags to enable build with symbols; required for crashdump feature
.IF "$(ENABLE_SYMBOLS)"=="SMALL"
CFLAGSENABLESYMBOLS=-g1
.ELSE
CFLAGSENABLESYMBOLS=-g
.ENDIF

### 
CFLAGS+=-nostdinc
CFLAGSCC=-pipe -march=pentiumpro
CFLAGSCXX=-pipe -march=pentiumpro -fno-for-scope -fpermissive
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
CFLAGS_NO_EXCEPTIONS=

CFLAGSOBJGUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL
CFLAGSOBJCUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL
CFLAGSOBJGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
CFLAGSOBJCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
CFLAGSSLOGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
CFLAGSSLOCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
CFLAGSPROF=
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=

CFLAGSOUTOBJ=-o
#plattform hart setzen 
CDEFS+=-D_M_IX86 
CDEFS+=-DSTLPORT_VERSION=450 -D_STLP_USE_DYNAMIC_LIB

STATIC=
DYNAMIC=

LINK*=$(WRAPCMD) ld
CYGLIB=$(LIB:s/;/ -L/)
LINKFLAGS=-nostdlib -Wl,--enable-runtime-pseudo-reloc -L$(CYGLIB)
LINKFLAGSAPPGUI=-Wl,--enable-stdcall-fixup -mwindows $(COMPATH)$/lib$/crt2.o
LINKFLAGSSHLGUI=-Wl,--enable-stdcall-fixup -mwindows -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o
LINKFLAGSAPPCUI=-Wl,--enable-stdcall-fixup -mconsole $(COMPATH)$/lib$/crt2.o
LINKFLAGSSHLCUI=-Wl,--enable-stdcall-fixup -mconsole -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o
LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=

STDLIBCPP=-lstdc++
UWINAPILIB*=$(DYNAMIC) -luwinapi

STDOBJVCL=$(L)$/salmain.obj
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
STDLIBGUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDLIBGUIST+= -lmsvcrt
STDLIBCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDLIBCUIST+= -lmsvcrt
STDLIBGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDLIBGUIMT+= -lmsvcrt -lmingwthrd
STDLIBCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDLIBCUIMT+= -lmsvcrt -lmingwthrd
STDSHLGUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDSHLGUIST+= -lmsvcrt -lcrtdll
STDSHLCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDSHLCUIST+= -lmsvcrt -lcrtdll
STDSHLGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDSHLGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd
STDSHLCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
STDSHLCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd

LIBSTLPORT=-lstlport_gcc $(STDLIBCPP)
LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP)

ADVAPI32LIB=-ladvapi32
SHELL32LIB=-lshell32
GDI32LIB=-lgdi32
OLE32LIB=-lole32
OLEAUT32LIB=-loleaut32
UUIDLIB=-luuid
WINSPOOLLIB=-lwinspool
IMM32LIB=-limm32
PSPLIB=-lpsp$(VERSION)$(DLLPOSTFIX)
VERSIONLIB=-lversion
WINMMLIB=-lwinmm
WSOCK32LIB=-lwsock32
MPRLIB=-lmpr
WS2_32LIB=-lws2_32
KERNEL32LIB=-lkernel32
USER32LIB=-luser32
MSVCRTLIB=-lmsvcrt
COMDLG32LIB=-lcomdlg32
COMCTL32LIB=-lcomctl32
DBGHELPLIB=-ldbghelp
PSAPILIB=-lpsapi

LIBMGR=$(WRAPCMD) ar
LIBFLAGS=-rsu

IMPLIB=$(WRAPCMD) ld
IMPLIBFLAGS=

MAPSYM=$(WRAPCMD) tmapsym
MAPSYMFLAGS=

RC=$(WRAPCMD) rc
RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=

DLLPOSTFIX=gi

IDLC=$(WRAPCMD) idlc
REGMERGE=$(WRAPCMD) regmerge
REGCOMPARE=$(WRAPCMD) regcompare
REGCOMP=$(WRAPCMD) regcomp
CPPUMAKER=$(WRAPCMD) cppumaker
JAVAMAKER=$(WRAPCMD) javamaker
RDBMAKER=$(WRAPCMD) rdbmaker
STARDEP=$(WRAPCMD) javadep
JAVAC=$(WRAPCMD) javac
JAVA=$(WRAPCMD) java
SCPCOMP=$(WRAPCMD) scpcomp
SCPLINK=$(WRAPCMD) scplink
LZIP=$(WRAPCMD) -env lzip
CPPLCC=$(WRAPCMD) cpplcc

.ENDIF
.ENDIF
# --- Windows-NT Allgemein ---

Lines 66-72 Link Here

(-)oo_1.1.1_src/solenv/inc/libs.mk.orig (-4 / +100 lines)
66	LIBPRE=libr	66	LIBPRE=libr
67	.ENDIF	67	.ENDIF
68		68
69	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	69	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC" \|\| "$(COM)"=="GCC"
70		70
71	#	71	#
72	#externe libs in plattform.mk	72	#externe libs in plattform.mk
Lines 76-90 Link Here
76	ICUUCLIB=-licuuc	76	ICUUCLIB=-licuuc
77	I18NUTILLIB=-li18nutil$(COMID)	77	I18NUTILLIB=-li18nutil$(COMID)
78	.IF "$(WITH_GPC)"!="NO"	78	.IF "$(WITH_GPC)"!="NO"
		79	.IF "$(GUI)$(COM)"=="WNTGCC"
		80	GPC3RDLIB=-lgpc_static
		81	.ELSE
79	GPC3RDLIB=-lgpc	82	GPC3RDLIB=-lgpc
80	.ENDIF	83	.ENDIF
		84	.ENDIF
		85	.IF "$(GUI)"=="WNT"
		86	SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
		87	.ELSE
81	SALHELPERLIB=-lsalhelper$(COMID)	88	SALHELPERLIB=-lsalhelper$(COMID)
		89	.ENDIF
82	XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)	90	XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
83	.INCLUDE .IGNORE : comphelper$/version.mk	91	.INCLUDE .IGNORE : comphelper$/version.mk
84	COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)	92	COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
85	CONNECTIVITYLIB=-lconnectivity	93	CONNECTIVITYLIB=-lconnectivity
86	LDAPBERLIB=-lldapber	94	LDAPBERLIB=-lldapber
		95	.IF "$(GUI)"=="WNT"
		96	TOOLSLIBST=-latools_static
		97	.ELSE
87	TOOLSLIBST=-latools	98	TOOLSLIBST=-latools
		99	.ENDIF
88	DVOSUTILLIBST=-ldvosutil	100	DVOSUTILLIBST=-ldvosutil
89	DUNOUTILLIBST=-ldunoutil	101	DUNOUTILLIBST=-ldunoutil
90	DVCLUTILLIBST=-ldvclutil	102	DVCLUTILLIBST=-ldvclutil
Lines 95-101 Link Here
95	RTLLIB=	107	RTLLIB=
96	TECLIB=	108	TECLIB=
97	CPPULIB=-lcppu	109	CPPULIB=-lcppu
		110	.IF "$(GUI)"=="WNT"
		111	CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
		112	.ELSE
98	CPPUHELPERLIB=-lcppuhelper$(COMID)	113	CPPUHELPERLIB=-lcppuhelper$(COMID)
		114	.ENDIF
99	.INCLUDE .IGNORE : ucbhelper$/version.mk	115	.INCLUDE .IGNORE : ucbhelper$/version.mk
100	UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)	116	UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
101	REGLIB=-lreg	117	REGLIB=-lreg
Lines 112-118 Link Here
112	SALTLSLIB=-lsaltls$(UDK_MAJOR)	128	SALTLSLIB=-lsaltls$(UDK_MAJOR)
113	SALZIPLIB=-lsalzip$(UDK_MAJOR)	129	SALZIPLIB=-lsalzip$(UDK_MAJOR)
114	RMCXTLIB=-lrmcxt	130	RMCXTLIB=-lrmcxt
		131	.IF "$(GUI)$(COM)"=="WNTGCC"
		132	BTSTRPLIB=-lbtstrp_static
		133	.ELSE
115	BTSTRPLIB=-lbtstrp	134	BTSTRPLIB=-lbtstrp
		135	.ENDIF
116	TRANSEXLIB=-ltransex	136	TRANSEXLIB=-ltransex
117	IOTXLIB=	137	IOTXLIB=
118	OTXLIB=-lotx_ind	138	OTXLIB=-lotx_ind
Lines 124-150 Link Here
124	USRLIB=-lusr$(OFFICEUPD)$(DLLPOSTFIX)	144	USRLIB=-lusr$(OFFICEUPD)$(DLLPOSTFIX)
125	SOTLIB=-lsot$(OFFICEUPD)$(DLLPOSTFIX)	145	SOTLIB=-lsot$(OFFICEUPD)$(DLLPOSTFIX)
126	ONELIB=-lone$(OFFICEUPD)$(DLLPOSTFIX)	146	ONELIB=-lone$(OFFICEUPD)$(DLLPOSTFIX)
127	MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)	147	MOZBASELIBST=-lnspr4 -lxpcombase_s
128	MOZBASELIB=-lnspr4 -lxpcom	148	MOZBASELIB=-lnspr4 -lxpcom
129	LDAPSDKLIB=-lldap50	149	LDAPSDKLIB=-lldap50
130	ONELIB=	150	ONELIB=
131	UNOLIB=	151	UNOLIB=
		152	.IF "$(GUI)$(COM)"=="WNTGCC"
		153	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX).a
		154	.ELSE
132	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX)$(DLLPOST)	155	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX)$(DLLPOST)
		156	.ENDIF
133	SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX)	157	SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX)
134	ICOLIB=-lico$(OFFICEUPD)$(DLLPOSTFIX)	158	ICOLIB=-lico$(OFFICEUPD)$(DLLPOSTFIX)
135	BSTRPLIB=-lbtstrp	159	BSTRPLIB=-lbtstrp
136	VCLLIBST=-lvcl	160	VCLLIBST=-lvcl
137	VCLLIB=$(SVLIB)	161	VCLLIB=$(SVLIB)
138	FREETYPELIB=-lfreetype	162	FREETYPELIB=-lfreetype
139	FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC)	163	FREETYPELIBST=-lfreetype
140	XPLIB=-l_xp	164	XPLIB=-l_xp
141	TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)	165	TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
142	SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)	166	SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
143	AUTOMATIONLIB=-lsts$(OFFICEUPD)$(DLLPOSTFIX)	167	AUTOMATIONLIB=-lsts$(OFFICEUPD)$(DLLPOSTFIX)
144	SVLLIB=-lsvl$(OFFICEUPD)$(DLLPOSTFIX)	168	SVLLIB=-lsvl$(OFFICEUPD)$(DLLPOSTFIX)
145	SVMEMLIB=	169	SVMEMLIB=
		170	.IF "$(GUI)$(COM)"=="WNTGCC"
		171	SVUNZIPLIB=-lsvunzip_static
		172	SVUNZIPDLL=-lunzipdll_static
		173	.ELSE
146	SVUNZIPLIB=-lsvunzip	174	SVUNZIPLIB=-lsvunzip
147	SVUNZIPDLL=-lzip$(OFFICEUPD)$(DLLPOSTFIX)	175	SVUNZIPDLL=-lzip$(OFFICEUPD)$(DLLPOSTFIX)
		176	.ENDIF
148	PLUGCTORLIB=-lplugctor	177	PLUGCTORLIB=-lplugctor
149	# PLUGCTORLIB=	178	# PLUGCTORLIB=
150	SO2LIB=-lso$(OFFICEUPD)$(DLLPOSTFIX)	179	SO2LIB=-lso$(OFFICEUPD)$(DLLPOSTFIX)
Lines 171-185 Link Here
171	HM2LIBST=-lhmwrap	200	HM2LIBST=-lhmwrap
172	LINGULIB=$(HM2LIBST)	201	LINGULIB=$(HM2LIBST)
173	LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)	202	LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
		203	.IF "$(GUI)$(COM)"=="WNTGCC"
		204	EXPAT3RDLIB=-lexpat_xmlparse_static -lexpat_xmltok_static
		205	EXPATASCII3RDLIB=-lascii_expat_xmlparse_static -lexpat_xmltok_static
		206	.ELSE
174	EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok	207	EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
175	EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok	208	EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
		209	.ENDIF
176	.IF "$(SYSTEM_ZLIB)"=="YES"	210	.IF "$(SYSTEM_ZLIB)"=="YES"
177	ZLIB3RDLIB=-lz	211	ZLIB3RDLIB=-lz
178	.ELSE	212	.ELSE
		213	.IF "$(GUI)$(COM)"=="WNTGCC"
		214	ZLIB3RDLIB=-lzlib_static
		215	.ELSE
179	ZLIB3RDLIB=-lzlib	216	ZLIB3RDLIB=-lzlib
180	.ENDIF	217	.ENDIF
		218	.ENDIF
		219	.IF "$(GUI)$(COM)"=="WNTGCC"
		220	JPEG3RDLIB=-ljpeglib_static
		221	NEON3RDLIB=-lneon_static
		222	.ELSE
181	JPEG3RDLIB=-ljpeglib	223	JPEG3RDLIB=-ljpeglib
182	NEON3RDLIB=-lneon	224	NEON3RDLIB=-lneon
		225	.ENDIF
183	BERKELEYLIB=-ldb-3.2	226	BERKELEYLIB=-ldb-3.2
184	BERKELEYCPPLIB=-ldb_cxx-3.2	227	BERKELEYCPPLIB=-ldb_cxx-3.2
185	CURLLIB=-lcurl	228	CURLLIB=-lcurl
Lines 189-203 Link Here
189	FWELIB=-lfwe$(OFFICEUPD)$(DLLPOSTFIX)	232	FWELIB=-lfwe$(OFFICEUPD)$(DLLPOSTFIX)
190	FWILIB=-lfwi$(OFFICEUPD)$(DLLPOSTFIX)	233	FWILIB=-lfwi$(OFFICEUPD)$(DLLPOSTFIX)
191	SVXLIB=-lsvx$(OFFICEUPD)$(DLLPOSTFIX)	234	SVXLIB=-lsvx$(OFFICEUPD)$(DLLPOSTFIX)
		235	.IF "$(GUI)$(COM)"=="WNTGCC"
		236	SVXLIB+=-ldl$(OFFICEUPD)$(DLLPOSTFIX)
		237	.ENDIF
192	BASCTLLIB=-lbasctl$(OFFICEUPD)$(DLLPOSTFIX)	238	BASCTLLIB=-lbasctl$(OFFICEUPD)$(DLLPOSTFIX)
		239	.IF "$(GUI)$(COM)"=="WNTGCC"
		240	BASICIDELIB=-lybctl_static
		241	.ELSE
193	BASICIDELIB=-lybctl	242	BASICIDELIB=-lybctl
		243	.ENDIF
194	SVXLLIB=-lsvxl	244	SVXLLIB=-lsvxl
195	CHAOSLIB=-lcnt$(OFFICEUPD)$(DLLPOSTFIX)	245	CHAOSLIB=-lcnt$(OFFICEUPD)$(DLLPOSTFIX)
196	UUILIB=-luui$(OFFICEUPD)$(DLLPOSTFIX)	246	UUILIB=-luui$(OFFICEUPD)$(DLLPOSTFIX)
197	DGLIB=	247	DGLIB=
198	SIMLIB=-lysim	248	SIMLIB=-lysim
		249	.IF "$(GUI)$(COM)"=="WNTGCC"
		250	SCHLIB=-lysch_static
		251	SMLIB=-lysm_static
		252	.ELSE
199	SCHLIB=-lysch	253	SCHLIB=-lysch
200	SMLIB=-lysm	254	SMLIB=-lysm
		255	.ENDIF
201	SBALIB=-lsbawrap	256	SBALIB=-lsbawrap
202	#SBALIB=-lsba$(OFFICEUPD)$(DLLPOSTFIX)	257	#SBALIB=-lsba$(OFFICEUPD)$(DLLPOSTFIX)
203	OFALIB=-lofa$(OFFICEUPD)$(DLLPOSTFIX)	258	OFALIB=-lofa$(OFFICEUPD)$(DLLPOSTFIX)
Lines 209-222 Link Here
209	TRACERLIB=-ltrc$(OFFICEUPD)$(DLLPOSTFIX)	264	TRACERLIB=-ltrc$(OFFICEUPD)$(DLLPOSTFIX)
210	PAPILIB=-lpap$(OFFICEUPD)$(DLLPOSTFIX)	265	PAPILIB=-lpap$(OFFICEUPD)$(DLLPOSTFIX)
211	TRCLIB=$(TRACERLIB)	266	TRCLIB=$(TRACERLIB)
		267	.IF "$(GUI)$(COM)"=="WNTGCC"
		268	SCLIB=-lsclib_static
		269	SDLIB=-lsdlib_static
		270	.ELSE
212	SCLIB=-lsclib	271	SCLIB=-lsclib
213	SDLIB=-lsdlib	272	SDLIB=-lsdlib
		273	.ENDIF
214	SDLLIB=-lsdl	274	SDLLIB=-lsdl
215	SWLIB=-lswlib
216	PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX)	275	PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX)
		276	.IF "$(GUI)$(COM)"=="WNTGCC"
		277	SWLIB=-lswlib_static
		278	SYSSHELLLIB=-lsysshell_static
		279	SABLOT3RDLIB=-lsablot_static
		280	APP3RDLIB=-lapp_static
		281	SAMPLE3RDLIB=-lsample_static
		282	HNJLIB=-lhnj_static
		283	MYSPELLLIB=-lmyspell_static
		284	COSVLIB=-lcosv_static
		285	UDMLIB=-ludm_static
		286	.ELSE
		287	SWLIB=-lswlib
217	SYSSHELLLIB=-lsysshell	288	SYSSHELLLIB=-lsysshell
		289	SABLOT3RDLIB=-lsablot
		290	APP3RDLIB=-lapp
		291	SAMPLE3RDLIB=-lsample
		292	HNJLIB=-lhnj
		293	MYSPELLLIB=-lmyspell
		294	COSVLIB=-lcosv
		295	UDMLIB=-ludm
		296	.ENDIF
218	SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX)	297	SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX)
		298	.IF "$(GUI)"=="WNT"
		299	JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
		300	.ELSE
219	JVMACCESSLIB = -ljvmaccess$(COMID)	301	JVMACCESSLIB = -ljvmaccess$(COMID)
		302	.ENDIF
		303	ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
		304	PYUNOLIB=-lpyuno
		305	PYTHONLIB=-lpython
220		306
221	#	307	#
222	# USED_%NAME%_LIBS	308	# USED_%NAME%_LIBS
Lines 369-376 Link Here
369	FREETYPELIBST=freetype.lib	455	FREETYPELIBST=freetype.lib
370	PKGCHKLIB=$(LIBPRE) ipkgchk.lib	456	PKGCHKLIB=$(LIBPRE) ipkgchk.lib
371	SYSSHELLLIB=sysshell.lib	457	SYSSHELLLIB=sysshell.lib
		458	SABLOT3RDLIB=sablot.lib
		459	APP3RDLIB=app.lib
		460	SAMPLE3RDLIB=sample.lib
		461	HNJLIB=libhnj.lib
		462	MYSPELLLIB=libmyspell.lib
		463	COSVLIB=cosv.lib
		464	UDMLIB=udm.lib
372	SSOOPTLIB=issoopt$(OFFICEUPD)$(DLLPOSTFIX).lib	465	SSOOPTLIB=issoopt$(OFFICEUPD)$(DLLPOSTFIX).lib
373	JVMACCESSLIB = $(LIBPRE) ijvmaccess.lib	466	JVMACCESSLIB = $(LIBPRE) ijvmaccess.lib
		467	ULINGULIB=$(LIBPRE) ulingu.lib
		468	PYUNOLIB=ipyuno.lib
		469	PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
374		470
375	.ENDIF # "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	471	.ENDIF # "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"
376		472




#ifndef __COMDEF_H__
#ifdef __MINGW32__
#include <windows.h>
#include <objidl.h>
#include <shlobj.h>

template<class T>
class CComPtr
{
public:
	CComPtr()
	{
		p=NULL;
	}
	~CComPtr()
	{
		if (p)
			p->Release();
	}
	CComPtr(const CComPtr<T>& lp)
	{
		if ((p = lp.p) != NULL)
			p->AddRef();
	}
	CComPtr(T* lp)
	{
		if ((p = lp) != NULL)
			p->AddRef();
	}
	T* operator=(const CComPtr<T>& lp)
	{
		return assign(lp.p);
	}
	T* operator=(T* lp)
	{
		return assign(lp);
	}
	bool operator!() const
	{
		return (p == NULL);
	}
	operator T*() const
	{
		return p;
	}
	T* operator->() const
	{
		return p;
	}
	T** operator&()
	{
		return &p;
	}
private:
	T* assign(T* lp)
	{
	  if (lp != NULL)
	    lp->AddRef();
	  if (p)
	    p->Release();
	  return p = lp;
	}
	bool operator==(T* pT) const
	{
		return p == pT;
	}
	T* p;
};
#define __uuidof(I) IID_##I
typedef CComPtr< IMalloc > IMallocPtr;
typedef CComPtr< IShellFolder > IShellFolderPtr;
typedef CComPtr< IDataObject > IDataObjectPtr;
typedef CComPtr< IStream > IStreamPtr;
typedef CComPtr< IEnumFORMATETC > IEnumFORMATETCPtr;
class _com_error {
public:
	// Constructors
	//
	_com_error(HRESULT hr,
               IErrorInfo* perrinfo = NULL,
               bool fAddRef = false) throw();
	_com_error(const _com_error& that) throw();

	// Destructor
	//
	virtual ~_com_error() throw();

	// Assignment operator
	//
	_com_error& operator=(const _com_error& that) throw();

	// Accessors
	//
	HRESULT Error() const throw() { return m_hresult; }
	WORD WCode() const throw();
	IErrorInfo * ErrorInfo() const throw();

	// IErrorInfo method accessors
	//
//	_bstr_t Description() const throw(_com_error);
	DWORD HelpContext() const throw();
//	_bstr_t HelpFile() const throw(_com_error);
//	_bstr_t Source() const throw(_com_error);
//	GUID GUID() const throw();

	// FormatMessage accessors
	const TCHAR * ErrorMessage() const throw();

	// EXCEPINFO.wCode <-> HRESULT mappers
	static HRESULT WCodeToHRESULT(WORD wCode) throw();
	static WORD HRESULTToWCode(HRESULT hr) throw();

private:
	enum {
		WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200),
		WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1
	};
	const HRESULT			m_hresult;
	IErrorInfo *			m_perrinfo;
	mutable TCHAR *			m_pszMsg;
};
#else
#include <../include/comdef.h>
#endif
#define __COMDEF_H__
#endif





#ifndef _WINRES_H
#define _WINRES_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif

#define VS_VERSION_INFO 1
#include <winresrc.h>
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#endif

Lines 87-99 Link Here

(-)oo_1.1.1_src/solenv/bin/getcompver.awk.orig (-2 / +2 lines)
87	x = match( $0, /".\..\..*"/ )	87	x = match( $0, /".\..\..*"/ )
88	CCversion = substr( $0, RSTART+1, RLENGTH-2)	88	CCversion = substr( $0, RSTART+1, RLENGTH-2)
89	}	89	}
90	/^[0-9][.][0-9]$/ {	90	/^[0-9][.][0-9]\x0d*$/ {
91	if ( compiler_matched == 0 ) {	91	if ( compiler_matched == 0 ) {
92	# need to blow to x.xx.xx for comparing	92	# need to blow to x.xx.xx for comparing
93	CCversion = $0 ".0"	93	CCversion = $0 ".0"
94	}	94	}
95	}	95	}
96	/^[0-9][.][0-9][.][0-9]*$/ {	96	/^[0-9][.][0-9][.][0-9]\x0d$/ {
97	if ( compiler_matched == 0 ) {	97	if ( compiler_matched == 0 ) {
98	CCversion = $0	98	CCversion = $0
99	}	99	}




	chomp( $d2 = qx{cygpath -w "$d1"} ) ;
	$variable =~ s/$d1/$d2/ ;
  }
  if ( $variable =~ /\A(-\w([\w]+=)?)[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end)
	# This regex: option -> $1, filename without quotes -> $3
    if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");};
	$d1_prefix = $1;
	$d1 = $3;
	# Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths
	if ( $d1 =~ / / ) {
		chomp( $d1 = qx{cygpath -d "$d1"} );

		  # remove .exe and convert to lower case
		  $shortcommand = lc $command ;
		  $shortcommand =~ s/\.exe$//;
		  $shortcommand =~ /([^\/]+$)/;
		  $shortcommand = $1;
		  foreach $i (@{$knownpara{$shortcommand}}) {
			if( $para =~ /$i/ ) {

    {
        replace_cyg_env;
    }
    if ( $command eq "-noshowcommand" )
    {
        $noshowcommand = 1;
    }
    
    $command = shift(@params);
}
if (!defined $noshowcommand)
    { print( STDERR "Command: $command\n" ); }

replace_cyg(\@params);
if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};

Return to issue 24588

Lines 156-162 Link Here

(-)oo_1.1.1_src/solenv/inc/tg_shl.mk.orig (-11 / +40 lines)
156		156
157	.IF "$(GUI)" != "UNX"	157	.IF "$(GUI)" != "UNX"
158	.IF "$(GUI)" == "WNT"	158	.IF "$(GUI)" == "WNT"
159	.IF "$(COM)" == "MSC"	159	.IF "$(COM)" != "GCC"
160	.IF "$(SHL$(TNR)IMPLIB)" != ""	160	.IF "$(SHL$(TNR)IMPLIB)" != ""
161	USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib	161	USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib
162	.ELSE # "$(SHL$(TNR)IMPLIB)" != ""	162	.ELSE # "$(SHL$(TNR)IMPLIB)" != ""
Lines 265-270 Link Here
265	SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))	265	SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))
266	SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)	266	SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)
267	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res	267	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
		268	SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
268	.ENDIF # "$(SHL$(TNR)RES)"!=""	269	.ENDIF # "$(SHL$(TNR)RES)"!=""
269	.ENDIF	270	.ENDIF
270		271
Lines 272-277 Link Here
272	SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res	273	SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res
273	SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)	274	SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)
274	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res	275	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
		276	SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
275	.ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""	277	.ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
276		278
277	.IF "$(NO_SHL$(TNR)DESCRIPTION)"==""	279	.IF "$(NO_SHL$(TNR)DESCRIPTION)"==""
Lines 314-320 Link Here
314	.IF "$(GUI)" == "WNT"	316	.IF "$(GUI)" == "WNT"
315	.IF "$(UPDATER)"=="YES"	317	.IF "$(UPDATER)"=="YES"
316	.IF "$(COM)"=="GCC"	318	.IF "$(COM)"=="GCC"
317	$(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c	319	$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
318	.ELSE	320	.ELSE
319	$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c	321	$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
320	.ENDIF # "$(COM)"=="GCC"	322	.ENDIF # "$(COM)"=="GCC"
Lines 344-360 Link Here
344	+$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)	346	+$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)
345	.ELSE # "$(USE_SHELL)"=="4nt"	347	.ELSE # "$(USE_SHELL)"=="4nt"
346	+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)	348	+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
		349	.IF "$(COM)"=="GCC"
		350	windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
		351	.ENDIF # "$(COM)"=="GCC"
347	.ENDIF # "$(USE_SHELL)"=="4nt"	352	.ENDIF # "$(USE_SHELL)"=="4nt"
348	.ENDIF # "$(SHL$(TNR)ALLRES)"!=""	353	.ENDIF # "$(SHL$(TNR)ALLRES)"!=""
349	.IF "$(linkinc)"==""
350	.IF "$(USE_DEFFILE)"!=""
351	.IF "$(COM)"=="GCC"	354	.IF "$(COM)"=="GCC"
		355	.IF "$(USE_DEFFILE)"!=""
		356	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-exp $(MISC)$/$(@:b).exp
352	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \	357	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
353	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \| tr -d ï\r\nï > $(MISC)$/$(@:b).cmd	358	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
354	@+$(TYPE) $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g \| tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd	359	`$(TYPE) /dev/null $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
355	@+echo $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd	360	-Wl,$(MISC)$/$(@:b).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
356	$(MISC)$/$(@:b).cmd	361	-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
		362	@+$(TYPE) $(MISC)$/$(@:b).cmd
		363	@+source $(MISC)$/$(@:b).cmd
		364	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a
		365	.ELSE # "$(USE_DEFFILE)"!=""
		366	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		367	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
		368	`$(TYPE) /dev/null $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		369	-Wl,$(LB)$/lib$(SHL$(TNR)TARGET).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
		370	-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
		371	@+$(TYPE) $(MISC)$/$(@:b).cmd
		372	@+source $(MISC)$/$(@:b).cmd
		373	.ENDIF # "$(USE_DEFFILE)"!=""
357	.ELSE	374	.ELSE
		375	.IF "$(linkinc)"==""
		376	.IF "$(USE_DEFFILE)"!=""
358	$(LINK) @$(mktmp \	377	$(LINK) @$(mktmp \
359	$(LINKFLAGS) \	378	$(LINKFLAGS) \
360	$(LINKFLAGSSHL) \	379	$(LINKFLAGSSHL) \
Lines 370-376 Link Here
370	$(STDSHL) $(STDSHL$(TNR)) \	389	$(STDSHL) $(STDSHL$(TNR)) \
371	$(SHL$(TNR)LINKRES) \	390	$(SHL$(TNR)LINKRES) \
372	)	391	)
373	.ENDIF # "$(COM)"=="GCC"
374	.ELSE # "$(USE_DEFFILE)"!=""	392	.ELSE # "$(USE_DEFFILE)"!=""
375	$(LINK) @$(mktmp $(LINKFLAGS) \	393	$(LINK) @$(mktmp $(LINKFLAGS) \
376	$(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \	394	$(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
Lines 403-408 Link Here
403	+$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk	421	+$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
404	$(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk	422	$(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
405	.ENDIF # "$(linkinc)"==""	423	.ENDIF # "$(linkinc)"==""
		424	.ENDIF # "$(COM)"=="GCC"
406	.ENDIF # "$(GUI)" == "WNT"	425	.ENDIF # "$(GUI)" == "WNT"
407	.IF "$(GUI)"=="UNX"	426	.IF "$(GUI)"=="UNX"
408	.IF "$(UPDATER)"=="YES"	427	.IF "$(UPDATER)"=="YES"
Lines 570-583 Link Here
570	@echo ------------------------------	589	@echo ------------------------------
571	@echo Making: $(SHL$(TNR)IMPLIBN)	590	@echo Making: $(SHL$(TNR)IMPLIBN)
572	.IF "$(GUI)" == "WNT"	591	.IF "$(GUI)" == "WNT"
		592	.IF "$(COM)"=="GCC"
		593	@echo no ImportLibs on mingw
		594	.IF "$(USE_DEFFILE)"==""
		595	@echo build .a instead
		596	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).exp
		597	.ENDIF # "$(USE_DEFFILE)==""
		598	@+-$(RM) $@
		599	@$(TOUCH) $@
		600	.ELSE # "$(COM)=="GCC"
573	# bei use_deffile implib von linker erstellt	601	# bei use_deffile implib von linker erstellt
574	.IF "$(USE_DEFFILE)"==""	602	.IF "$(USE_DEFFILE)"==""
575	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \	603	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
576	-def:$(SHL$(TNR)DEF) )	604	-def:$(SHL$(TNR)DEF) )
577	.ELSE # "$(GUI)" == "WNT"	605	.ELSE # "$(USE_DEFFILE)==""
578	+$(TOUCH) $@	606	+$(TOUCH) $@
579	+@echo build of $(SHL$(TNR)TARGETN) creates $@	607	+@echo build of $(SHL$(TNR)TARGETN) creates $@
580	.ENDIF # "$(GUI)" == "WNT"	608	.ENDIF # "$(USE_DEFFILE)==""
		609	.ENDIF # "$(COM)"=="GCC"
581	.ELSE	610	.ELSE
582	.IF "$(GUI)" == "WIN" \|\| "$(GUI)" == "OS2"	611	.IF "$(GUI)" == "WIN" \|\| "$(GUI)" == "OS2"
583	.IF "$(USE_DEFFILE)"==""	612	.IF "$(USE_DEFFILE)"==""

Lines 444-449 Link Here

(-)oo_1.1.1_src/solenv/inc/wnt.mk.orig (-37 / +116 lines)
444	RCLINKFLAGS=	444	RCLINKFLAGS=
445	RCSETVERSION=	445	RCSETVERSION=
446		446
		447	ADVAPI32LIB=advapi32.lib
		448	SHELL32LIB=shell32.lib
		449	GDI32LIB=gdi32.lib
		450	OLE32LIB=ole32.lib
		451	OLEAUT32LIB=oleaut32.lib
		452	UUIDLIB=uuid.lib
		453	WINSPOOLLIB=winspool.lib
		454	IMM32LIB=imm32.lib
		455	PSPLIB=apsp.lib
		456	VERSIONLIB=version.lib
		457	WINMMLIB=winmm.lib
		458	WSOCK32LIB=wsock32.lib
		459	MPRLIB=mpr.lib
		460	WS2_32LIB=ws2_32.lib
		461	KERNEL32LIB=kernel32.lib
		462	USER32LIB=user32.lib
		463	MSVCRTLIB=msvcrt.lib
		464	COMDLG32LIB=comdlg32.lib
		465	COMCTL32LIB=comctl32.lib
		466	DBGHELPLIB=dbghelp.lib
		467	PSAPILIB=psapi.lib
447		468
448	DLLPOSTFIX=mi	469	DLLPOSTFIX=mi
449		470
Lines 470-498 Link Here
470	.IF "$(COM)" == "GCC"	492	.IF "$(COM)" == "GCC"
471	.IF "$(CPU)" == "I"	493	.IF "$(CPU)" == "I"
472		494
473	ASM=	495	ASM=ml
474	AFLAGS=	496	AFLAGS=/c /Cp /coff
475		497
476	CXX*=gcc	498	CXX*=$(WRAPCMD) gcc
477	### Der gcc vertraegt kein Semikolon im Include-Pfad RT	499	### Der gcc vertraegt kein Semikolon im Include-Pfad RT
478	# old:	500	# old:
479	#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)	501	#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)
480	# new:	502	# new:
481	CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /)	503	CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /)
482	CFLAGS=-c -Wall -I$(CYGINC) $(OLE2DEF)	504	CFLAGS=-fmessage-length=0 -c -Wall -I$(CYGINC) $(OLE2DEF)
		505
		506	# flags to enable build with symbols; required for crashdump feature
		507	.IF "$(ENABLE_SYMBOLS)"=="SMALL"
		508	CFLAGSENABLESYMBOLS=-g1
		509	.ELSE
		510	CFLAGSENABLESYMBOLS=-g
		511	.ENDIF
		512
483	###	513	###
484	CFLAGS+=-nostdinc -fPIC	514	CFLAGS+=-nostdinc
485	CFLAGSCC=-pipe -mpentium	515	CFLAGSCC=-pipe -march=pentiumpro
486	CFLAGSCXX=-pipe -mpentium -fguiding-decls	516	CFLAGSCXX=-pipe -march=pentiumpro -fno-for-scope -fpermissive
487	CFLAGSEXCEPTIONS=-fexceptions	517	CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
488	CFLAGS_NO_EXCEPTIONS=-fno-exceptions	518	CFLAGS_NO_EXCEPTIONS=
489		519
490	CFLAGSOBJGUIST=-DWIN32	520	CFLAGSOBJGUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL
491	CFLAGSOBJCUIST=-DWIN32	521	CFLAGSOBJCUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL
492	CFLAGSOBJGUIMT=-DWIN32	522	CFLAGSOBJGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
493	CFLAGSOBJCUIMT=-DWIN32	523	CFLAGSOBJCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
494	CFLAGSSLOGUIMT=-DWIN32 -fPIC	524	CFLAGSSLOGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
495	CFLAGSSLOCUIMT=-DWIN32 -fPIC	525	CFLAGSSLOCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL
496	CFLAGSPROF=	526	CFLAGSPROF=
497	CFLAGSDEBUG=-g	527	CFLAGSDEBUG=-g
498	CFLAGSDBGUTIL=	528	CFLAGSDBGUTIL=
Lines 501-555 Link Here
501	CFLAGSOUTOBJ=-o	531	CFLAGSOUTOBJ=-o
502	#plattform hart setzen	532	#plattform hart setzen
503	CDEFS+=-D_M_IX86	533	CDEFS+=-D_M_IX86
		534	CDEFS+=-DSTLPORT_VERSION=450 -D_STLP_USE_DYNAMIC_LIB
504		535
505	STATIC= -static	536	STATIC=
506	DYNAMIC= -dynamic	537	DYNAMIC=
507		538
508	LINK*=ld	539	LINK*=$(WRAPCMD) ld
509	CYGLIB=$(LIB:s/;/ -L/)	540	CYGLIB=$(LIB:s/;/ -L/)
510	LINKFLAGS=-nodefaultlibs -L$(CYGLIB)	541	LINKFLAGS=-nostdlib -Wl,--enable-runtime-pseudo-reloc -L$(CYGLIB)
511	LINKFLAGSAPPGUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o	542	LINKFLAGSAPPGUI=-Wl,--enable-stdcall-fixup -mwindows $(COMPATH)$/lib$/crt2.o
512	LINKFLAGSSHLGUI=--warn-once	543	LINKFLAGSSHLGUI=-Wl,--enable-stdcall-fixup -mwindows -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o
513	LINKFLAGSAPPCUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o	544	LINKFLAGSAPPCUI=-Wl,--enable-stdcall-fixup -mconsole $(COMPATH)$/lib$/crt2.o
514	LINKFLAGSSHLCUI=--warn-once	545	LINKFLAGSSHLCUI=-Wl,--enable-stdcall-fixup -mconsole -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o
515	LINKFLAGSTACK=	546	LINKFLAGSTACK=
516	LINKFLAGSPROF=	547	LINKFLAGSPROF=
517	LINKFLAGSDEBUG=-g	548	LINKFLAGSDEBUG=-g
518	LINKFLAGSOPT=	549	LINKFLAGSOPT=
519		550
520	STDLIBCPP=-lstdc++	551	STDLIBCPP=-lstdc++
		552	UWINAPILIB*=$(DYNAMIC) -luwinapi
521		553
522	STDOBJVCL=$(L)$/salmain.obj	554	STDOBJVCL=$(L)$/salmain.obj
523	STDOBJGUI=	555	STDOBJGUI=
524	STDSLOGUI=	556	STDSLOGUI=
525	STDOBJCUI=	557	STDOBJCUI=
526	STDSLOCUI=	558	STDSLOCUI=
527	STDLIBGUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32	559	STDLIBGUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
528	STDLIBCUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32	560	STDLIBGUIST+= -lmsvcrt
529	STDLIBGUIMT=-dynamic -ldl -lm -lmingw32 -lkernel32 -luser32 -lgcc -lmoldname	561	STDLIBCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
530	STDLIBGUIMT+= -lmsvcrt -lcrtdll -luser32	562	STDLIBCUIST+= -lmsvcrt
531	STDLIBCUIMT=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lpthread -lm -lkernel32 -luser32	563	STDLIBGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
532	STDSHLGUIMT=-dynamic -ldl -lm -lkernel32 -luser32 -lmingw32 -lgcc	564	STDLIBGUIMT+= -lmsvcrt -lmingwthrd
533	STDSHLGUIMT+= -lmoldname -lmsvcrt -lcrtdll -luser32	565	STDLIBCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
534	STDSHLCUIMT=-dynamic -ldl -lm -lkernel32 -luser32	566	STDLIBCUIMT+= -lmsvcrt -lmingwthrd
		567	STDSHLGUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
		568	STDSHLGUIST+= -lmsvcrt -lcrtdll
		569	STDSHLCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
		570	STDSHLCUIST+= -lmsvcrt -lcrtdll
		571	STDSHLGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
		572	STDSHLGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd
		573	STDSHLCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32
		574	STDSHLCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd
		575
		576	LIBSTLPORT=-lstlport_gcc $(STDLIBCPP)
		577	LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP)
		578
		579	ADVAPI32LIB=-ladvapi32
		580	SHELL32LIB=-lshell32
		581	GDI32LIB=-lgdi32
		582	OLE32LIB=-lole32
		583	OLEAUT32LIB=-loleaut32
		584	UUIDLIB=-luuid
		585	WINSPOOLLIB=-lwinspool
		586	IMM32LIB=-limm32
		587	PSPLIB=-lpsp$(VERSION)$(DLLPOSTFIX)
		588	VERSIONLIB=-lversion
		589	WINMMLIB=-lwinmm
		590	WSOCK32LIB=-lwsock32
		591	MPRLIB=-lmpr
		592	WS2_32LIB=-lws2_32
		593	KERNEL32LIB=-lkernel32
		594	USER32LIB=-luser32
		595	MSVCRTLIB=-lmsvcrt
		596	COMDLG32LIB=-lcomdlg32
		597	COMCTL32LIB=-lcomctl32
		598	DBGHELPLIB=-ldbghelp
		599	PSAPILIB=-lpsapi
535		600
536	LIBMGR=ar	601	LIBMGR=$(WRAPCMD) ar
537	LIBFLAGS=-rsu	602	LIBFLAGS=-rsu
538		603
539	IMPLIB=ld	604	IMPLIB=$(WRAPCMD) ld
540	IMPLIBFLAGS=	605	IMPLIBFLAGS=
541		606
542	MAPSYM=tmapsym	607	MAPSYM=$(WRAPCMD) tmapsym
543	MAPSYMFLAGS=	608	MAPSYMFLAGS=
544		609
545	RC=rc	610	RC=$(WRAPCMD) rc
546	RCFLAGS=-DWIN32 -fo$@ $(RCFILES)	611	RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES)
547	RCLINK=	612	RCLINK=
548	RCLINKFLAGS=	613	RCLINKFLAGS=
549	RCSETVERSION=	614	RCSETVERSION=
550		615
551	DLLPOSTFIX=gi	616	DLLPOSTFIX=gi
552		617
		618	IDLC=$(WRAPCMD) idlc
		619	REGMERGE=$(WRAPCMD) regmerge
		620	REGCOMPARE=$(WRAPCMD) regcompare
		621	REGCOMP=$(WRAPCMD) regcomp
		622	CPPUMAKER=$(WRAPCMD) cppumaker
		623	JAVAMAKER=$(WRAPCMD) javamaker
		624	RDBMAKER=$(WRAPCMD) rdbmaker
		625	STARDEP=$(WRAPCMD) javadep
		626	JAVAC=$(WRAPCMD) javac
		627	JAVA=$(WRAPCMD) java
		628	SCPCOMP=$(WRAPCMD) scpcomp
		629	SCPLINK=$(WRAPCMD) scplink
		630	LZIP=$(WRAPCMD) -env lzip
		631	CPPLCC=$(WRAPCMD) cpplcc
		632
553	.ENDIF	633	.ENDIF
554	.ENDIF	634	.ENDIF
555	# --- Windows-NT Allgemein ---	635	# --- Windows-NT Allgemein ---

Line 0 Link Here

(-)oo_1.1.1_src/solenv/inc/comdef.h.orig (+127 lines)
		1	#ifndef __COMDEF_H__
		2	#ifdef __MINGW32__
		3	#include <windows.h>
		4	#include <objidl.h>
		5	#include <shlobj.h>
		6
		7	template<class T>
		8	class CComPtr
		9	{
		10	public:
		11	CComPtr()
		12	{
		13	p=NULL;
		14	}
		15	~CComPtr()
		16	{
		17	if (p)
		18	p->Release();
		19	}
		20	CComPtr(const CComPtr<T>& lp)
		21	{
		22	if ((p = lp.p) != NULL)
		23	p->AddRef();
		24	}
		25	CComPtr(T* lp)
		26	{
		27	if ((p = lp) != NULL)
		28	p->AddRef();
		29	}
		30	T* operator=(const CComPtr<T>& lp)
		31	{
		32	return assign(lp.p);
		33	}
		34	T* operator=(T* lp)
		35	{
		36	return assign(lp);
		37	}
		38	bool operator!() const
		39	{
		40	return (p == NULL);
		41	}
		42	operator T*() const
		43	{
		44	return p;
		45	}
		46	T* operator->() const
		47	{
		48	return p;
		49	}
		50	T** operator&()
		51	{
		52	return &p;
		53	}
		54	private:
		55	T* assign(T* lp)
		56	{
		57	if (lp != NULL)
		58	lp->AddRef();
		59	if (p)
		60	p->Release();
		61	return p = lp;
		62	}
		63	bool operator==(T* pT) const
		64	{
65	return p == pT;
66	}
67	T* p;
68	};
69	#define __uuidof(I) IID_##I
70	typedef CComPtr< IMalloc > IMallocPtr;
71	typedef CComPtr< IShellFolder > IShellFolderPtr;
72	typedef CComPtr< IDataObject > IDataObjectPtr;
73	typedef CComPtr< IStream > IStreamPtr;
74	typedef CComPtr< IEnumFORMATETC > IEnumFORMATETCPtr;
75	class _com_error {
76	public:
77	// Constructors
78	//
79	_com_error(HRESULT hr,
80	IErrorInfo* perrinfo = NULL,
81	bool fAddRef = false) throw();
82	_com_error(const _com_error& that) throw();
83
84	// Destructor
85	//
86	virtual ~_com_error() throw();
87
88	// Assignment operator
89	//
90	_com_error& operator=(const _com_error& that) throw();
91
92	// Accessors
93	//
94	HRESULT Error() const throw() { return m_hresult; }
95	WORD WCode() const throw();
96	IErrorInfo * ErrorInfo() const throw();
97
98	// IErrorInfo method accessors
99	//
100	// _bstr_t Description() const throw(_com_error);
101	DWORD HelpContext() const throw();
102	// _bstr_t HelpFile() const throw(_com_error);
103	// _bstr_t Source() const throw(_com_error);
104	// GUID GUID() const throw();
105
106	// FormatMessage accessors
107	const TCHAR * ErrorMessage() const throw();
108
109	// EXCEPINFO.wCode <-> HRESULT mappers
110	static HRESULT WCodeToHRESULT(WORD wCode) throw();
111	static WORD HRESULTToWCode(HRESULT hr) throw();
112
113	private:
114	enum {
115	WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200),
116	WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1
117	};
118	const HRESULT m_hresult;
119	IErrorInfo * m_perrinfo;
120	mutable TCHAR * m_pszMsg;
121	};
122	#else
123	#include <../include/comdef.h>
124	#endif
125	#define __COMDEF_H__
126	#endif
127

Line 0 Link Here

(-)oo_1.1.1_src/solenv/inc/winres.h.orig (+13 lines)
	1	#ifndef _WINRES_H
	2	#define _WINRES_H
	3	#if __GNUC__ >=3
	4	#pragma GCC system_header
	5	#endif
	6
	7	#define VS_VERSION_INFO 1
	8	#include <winresrc.h>
	9	#ifdef IDC_STATIC
	10	#undef IDC_STATIC
	11	#endif
	12	#define IDC_STATIC (-1)
	13	#endif

Lines 110-120 Link Here

(-)oo_1.1.1_src/solenv/bin/guw.pl.orig (-5 / +10 lines)
110	chomp( $d2 = qx{cygpath -w "$d1"} ) ;	110	chomp( $d2 = qx{cygpath -w "$d1"} ) ;
111	$variable =~ s/$d1/$d2/ ;	111	$variable =~ s/$d1/$d2/ ;
112	}	112	}
113	if ( $variable =~ /\A(-\w)[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end)	113	if ( $variable =~ /\A(-\w([\w]+=)?)[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end)
114	# This regex: option -> $1, filename without quotes -> $2	114	# This regex: option -> $1, filename without quotes -> $3
115	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");};	115	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");};
116	$d1_prefix = $1;	116	$d1_prefix = $1;
117	$d1 = $2;	117	$d1 = $3;
118	# Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths	118	# Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths
119	if ( $d1 =~ / / ) {	119	if ( $d1 =~ / / ) {
120	chomp( $d1 = qx{cygpath -d "$d1"} );	120	chomp( $d1 = qx{cygpath -d "$d1"} );
Lines 195-201 Link Here
195	# remove .exe and convert to lower case	195	# remove .exe and convert to lower case
196	$shortcommand = lc $command ;	196	$shortcommand = lc $command ;
197	$shortcommand =~ s/\.exe$//;	197	$shortcommand =~ s/\.exe$//;
198	$shortcommand =~ /(\w+$)/;	198	$shortcommand =~ /([^\/]+$)/;
199	$shortcommand = $1;	199	$shortcommand = $1;
200	foreach $i (@{$knownpara{$shortcommand}}) {	200	foreach $i (@{$knownpara{$shortcommand}}) {
201	if( $para =~ /$i/ ) {	201	if( $para =~ /$i/ ) {
Lines 258-267 Link Here
258	{	258	{
259	replace_cyg_env;	259	replace_cyg_env;
260	}	260	}
		261	if ( $command eq "-noshowcommand" )
		262	{
		263	$noshowcommand = 1;
		264	}
261		265
262	$command = shift(@params);	266	$command = shift(@params);
263	}	267	}
264	print( STDERR "Command: $command\n" );	268	if (!defined $noshowcommand)
		269	{ print( STDERR "Command: $command\n" ); }
265		270
266	replace_cyg(\@params);	271	replace_cyg(\@params);
267	if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};	272	if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};