Attachment #12596 for issue #24588

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

Lines 74-80 Link Here

(-)solenv/inc/rules.mk.orig (-9 / +29 lines)
74	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )	74	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )
75	@+$(ECHONL)	75	@+$(ECHONL)
76	.IF "$(COM)"=="GCC"	76	.IF "$(COM)"=="GCC"
77	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx	77	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$.cxx
78	.ELSE	78	.ELSE
79	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )	79	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cxx )
80	.ENDIF	80	.ENDIF
Lines 92-98 Link Here
92	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )	92	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )
93	@+$(ECHONL)	93	@+$(ECHONL)
94	.IF "$(COM)"=="GCC"	94	.IF "$(COM)"=="GCC"
95	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp	95	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$.cpp
96	.ELSE	96	.ELSE
97	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )	97	$(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(CFLAGSINCXX)$(PWD)$/$.cpp )
98	.ENDIF	98	.ENDIF
Lines 114-120 Link Here
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)$.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 184-190 Link Here
184	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )	200	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )
185	@+$(ECHONL)	201	@+$(ECHONL)
186	.IF "$(COM)"=="GCC"	202	.IF "$(COM)"=="GCC"
187	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c	203	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$.obj $.c
188	.ELSE	204	.ELSE
189	+-@echo Cflags: $(CFLAGS)	205	+-@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 )
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 625-631 Link Here
625	.SOURCE.idl : . $(SOLARVER)$/$(INPATH)$/idl$/remote $(SOLARVER)$/$(INPATH)$/idl $(SOLARVER)$/$(INPATH)$/idl$(UPDMINOREXT)$/$(PACKAGE)	645	.SOURCE.idl : . $(SOLARVER)$/$(INPATH)$/idl$/remote $(SOLARVER)$/$(INPATH)$/idl $(SOLARVER)$/$(INPATH)$/idl$(UPDMINOREXT)$/$(PACKAGE)
626		646
627	$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl	647	$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl
628	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $< )	648	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucr$/$(IDLPACKAGE) $< )
629		649
630	$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl	650	$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl
631	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $< )	651	+$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $< )

Lines 18-23 Link Here

(-)solenv/inc/_tg_app.mk.orig (-10 / +178 lines)
18	.ENDIF	18	.ENDIF
19	.ENDIF	19	.ENDIF
20		20
		21	APP1RESO=
		22	.IF "$(GUI)" != "WNT" \|\| "$(COM)" != "GCC"
		23	.ELSE
		24	.IF "$(APP1LINKRES)" != "" \|\| "$(APP1RES)" != ""
		25	APP1RESO=$(MISC)$/$(APP1TARGET)_res.o
		26	.ENDIF
		27	.ENDIF
		28
21	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	29	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
22	USE_APP1DEF=$(APP1DEF)	30	USE_APP1DEF=$(APP1DEF)
23	.ELSE	31	.ELSE
Lines 124-130 Link Here
124	.ENDIF	132	.ENDIF
125	.ELSE # "$(USE_SHELL)"=="4nt"	133	.ELSE # "$(USE_SHELL)"=="4nt"
126	.IF "$(APP1ICON)" != ""	134	.IF "$(APP1ICON)" != ""
127	@-+guw.pl echo 1 ICON \"$(APP1ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc	135	@-+$(WRAPCMD) echo 1 ICON \"$(APP1ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc
128	.ENDIF	136	.ENDIF
129	.IF "$(APP1VERINFO)" != ""	137	.IF "$(APP1VERINFO)" != ""
130	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc	138	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
Lines 133-138 Link Here
133	.ENDIF # "$(USE_SHELL)"=="4nt"	141	.ENDIF # "$(USE_SHELL)"=="4nt"
134	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc	142	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
135	.ENDIF # "$(APP1LINKRES)" != ""	143	.ENDIF # "$(APP1LINKRES)" != ""
		144	.IF "$(COM)" == "GCC"
		145	@+echo mingw
		146	.IF "$(APP1LINKRES)" != "" \|\| "$(APP1RES)" != ""
		147	@cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.RES
		148	windres $(MISC)$/$(@:b)_all.RES $(APP1RESO)
		149	.ENDIF
		150	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		151	$(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
		152	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \
		153	`$(TYPE) /dev/null $(APP1LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		154	$(APP_LINKTYPE) $(APP1LIBSALCPPRT) -dynamic $(APP1STDLIBS) -static $(STDLIB) $(STDLIB1) > $(MISC)$/$(@:b).cmd
		155	@+$(TYPE) $(MISC)$/$(@:b).cmd
		156	@+source $(MISC)$/$(@:b).cmd
		157	@ls -l $@
		158	.ELSE
136	.IF "$(linkinc)" == ""	159	.IF "$(linkinc)" == ""
137	$(LINK) @$(mktmp \	160	$(LINK) @$(mktmp \
138	$(LINKFLAGS) \	161	$(LINKFLAGS) \
Lines 169-174 Link Here
169	+if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst >> $(MISC)\$(APP1TARGET).lnk	192	+if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst >> $(MISC)\$(APP1TARGET).lnk
170	$(LINK) @$(MISC)\$(APP1TARGET).lnk	193	$(LINK) @$(MISC)\$(APP1TARGET).lnk
171	.ENDIF # "$(linkinc)" == ""	194	.ENDIF # "$(linkinc)" == ""
		195	.ENDIF
172	.IF "$(APP1TARGET)" == "loader"	196	.IF "$(APP1TARGET)" == "loader"
173	+$(PERL) loader.pl $@	197	+$(PERL) loader.pl $@
174	.IF "$(USE_SHELL)"=="4nt"	198	.IF "$(USE_SHELL)"=="4nt"
Lines 338-344 Link Here
338	.ENDIF	362	.ENDIF
339	.ELSE # "$(USE_SHELL)"=="4nt"	363	.ELSE # "$(USE_SHELL)"=="4nt"
340	.IF "$(APP2ICON)" != ""	364	.IF "$(APP2ICON)" != ""
341	@-+guw.pl echo 1 ICON \"$(APP2ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc	365	@-+$(WRAPCMD) echo 1 ICON \"$(APP2ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc
342	.ENDIF	366	.ENDIF
343	.IF "$(APP2VERINFO)" != ""	367	.IF "$(APP2VERINFO)" != ""
344	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc	368	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
Lines 347-352 Link Here
347	.ENDIF # "$(USE_SHELL)"=="4nt"	371	.ENDIF # "$(USE_SHELL)"=="4nt"
348	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc	372	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
349	.ENDIF # "$(APP2LINKRES)" != ""	373	.ENDIF # "$(APP2LINKRES)" != ""
		374	.IF "$(COM)" == "GCC"
		375	@+echo mingw
		376	.IF "$(APP2LINKRES)" != "" \|\| "$(APP2RES)" != ""
		377	@cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.RES
		378	windres $(MISC)$/$(@:b)_all.RES $(APP2RESO)
		379	.ENDIF
		380	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		381	$(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
		382	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \
		383	`$(TYPE) /dev/null $(APP2LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		384	$(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) > $(MISC)$/$(@:b).cmd
		385	@+$(TYPE) $(MISC)$/$(@:b).cmd
		386	@+source $(MISC)$/$(@:b).cmd
		387	@ls -l $@
		388	.ELSE
350	.IF "$(linkinc)" == ""	389	.IF "$(linkinc)" == ""
351	$(LINK) @$(mktmp \	390	$(LINK) @$(mktmp \
352	$(LINKFLAGS) \	391	$(LINKFLAGS) \
Lines 383-388 Link Here
383	+if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst >> $(MISC)\$(APP2TARGET).lnk	422	+if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst >> $(MISC)\$(APP2TARGET).lnk
384	$(LINK) @$(MISC)\$(APP2TARGET).lnk	423	$(LINK) @$(MISC)\$(APP2TARGET).lnk
385	.ENDIF # "$(linkinc)" == ""	424	.ENDIF # "$(linkinc)" == ""
		425	.ENDIF
386	.IF "$(APP2TARGET)" == "loader"	426	.IF "$(APP2TARGET)" == "loader"
387	+$(PERL) loader.pl $@	427	+$(PERL) loader.pl $@
388	.IF "$(USE_SHELL)"=="4nt"	428	.IF "$(USE_SHELL)"=="4nt"
Lines 552-558 Link Here
552	.ENDIF	592	.ENDIF
553	.ELSE # "$(USE_SHELL)"=="4nt"	593	.ELSE # "$(USE_SHELL)"=="4nt"
554	.IF "$(APP3ICON)" != ""	594	.IF "$(APP3ICON)" != ""
555	@-+guw.pl echo 1 ICON \"$(APP3ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc	595	@-+$(WRAPCMD) echo 1 ICON \"$(APP3ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc
556	.ENDIF	596	.ENDIF
557	.IF "$(APP3VERINFO)" != ""	597	.IF "$(APP3VERINFO)" != ""
558	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc	598	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
Lines 561-566 Link Here
561	.ENDIF # "$(USE_SHELL)"=="4nt"	601	.ENDIF # "$(USE_SHELL)"=="4nt"
562	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc	602	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
563	.ENDIF # "$(APP3LINKRES)" != ""	603	.ENDIF # "$(APP3LINKRES)" != ""
		604	.IF "$(COM)" == "GCC"
		605	@+echo mingw
		606	.IF "$(APP3LINKRES)" != "" \|\| "$(APP3RES)" != ""
		607	@cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.RES
		608	windres $(MISC)$/$(@:b)_all.RES $(APP3RESO)
		609	.ENDIF
		610	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		611	$(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
		612	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \
		613	`$(TYPE) /dev/null $(APP3LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		614	$(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) > $(MISC)$/$(@:b).cmd
		615	@+$(TYPE) $(MISC)$/$(@:b).cmd
		616	@+source $(MISC)$/$(@:b).cmd
		617	@ls -l $@
		618	.ELSE
564	.IF "$(linkinc)" == ""	619	.IF "$(linkinc)" == ""
565	$(LINK) @$(mktmp \	620	$(LINK) @$(mktmp \
566	$(LINKFLAGS) \	621	$(LINKFLAGS) \
Lines 597-602 Link Here
597	+if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst >> $(MISC)\$(APP3TARGET).lnk	652	+if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst >> $(MISC)\$(APP3TARGET).lnk
598	$(LINK) @$(MISC)\$(APP3TARGET).lnk	653	$(LINK) @$(MISC)\$(APP3TARGET).lnk
599	.ENDIF # "$(linkinc)" == ""	654	.ENDIF # "$(linkinc)" == ""
		655	.ENDIF
600	.IF "$(APP3TARGET)" == "loader"	656	.IF "$(APP3TARGET)" == "loader"
601	+$(PERL) loader.pl $@	657	+$(PERL) loader.pl $@
602	.IF "$(USE_SHELL)"=="4nt"	658	.IF "$(USE_SHELL)"=="4nt"
Lines 766-772 Link Here
766	.ENDIF	822	.ENDIF
767	.ELSE # "$(USE_SHELL)"=="4nt"	823	.ELSE # "$(USE_SHELL)"=="4nt"
768	.IF "$(APP4ICON)" != ""	824	.IF "$(APP4ICON)" != ""
769	@-+guw.pl echo 1 ICON \"$(APP4ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc	825	@-+$(WRAPCMD) echo 1 ICON \"$(APP4ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc
770	.ENDIF	826	.ENDIF
771	.IF "$(APP4VERINFO)" != ""	827	.IF "$(APP4VERINFO)" != ""
772	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc	828	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
Lines 775-780 Link Here
775	.ENDIF # "$(USE_SHELL)"=="4nt"	831	.ENDIF # "$(USE_SHELL)"=="4nt"
776	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc	832	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
777	.ENDIF # "$(APP4LINKRES)" != ""	833	.ENDIF # "$(APP4LINKRES)" != ""
		834	.IF "$(COM)" == "GCC"
		835	@+echo mingw
		836	.IF "$(APP4LINKRES)" != "" \|\| "$(APP4RES)" != ""
		837	@cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.RES
		838	windres $(MISC)$/$(@:b)_all.RES $(APP4RESO)
		839	.ENDIF
		840	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		841	$(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
		842	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \
		843	`$(TYPE) /dev/null $(APP4LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		844	$(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) > $(MISC)$/$(@:b).cmd
		845	@+$(TYPE) $(MISC)$/$(@:b).cmd
		846	@+source $(MISC)$/$(@:b).cmd
		847	@ls -l $@
		848	.ELSE
778	.IF "$(linkinc)" == ""	849	.IF "$(linkinc)" == ""
779	$(LINK) @$(mktmp \	850	$(LINK) @$(mktmp \
780	$(LINKFLAGS) \	851	$(LINKFLAGS) \
Lines 811-816 Link Here
811	+if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst >> $(MISC)\$(APP4TARGET).lnk	882	+if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst >> $(MISC)\$(APP4TARGET).lnk
812	$(LINK) @$(MISC)\$(APP4TARGET).lnk	883	$(LINK) @$(MISC)\$(APP4TARGET).lnk
813	.ENDIF # "$(linkinc)" == ""	884	.ENDIF # "$(linkinc)" == ""
		885	.ENDIF
814	.IF "$(APP4TARGET)" == "loader"	886	.IF "$(APP4TARGET)" == "loader"
815	+$(PERL) loader.pl $@	887	+$(PERL) loader.pl $@
816	.IF "$(USE_SHELL)"=="4nt"	888	.IF "$(USE_SHELL)"=="4nt"
Lines 980-986 Link Here
980	.ENDIF	1052	.ENDIF
981	.ELSE # "$(USE_SHELL)"=="4nt"	1053	.ELSE # "$(USE_SHELL)"=="4nt"
982	.IF "$(APP5ICON)" != ""	1054	.IF "$(APP5ICON)" != ""
983	@-+guw.pl echo 1 ICON \"$(APP5ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc	1055	@-+$(WRAPCMD) echo 1 ICON \"$(APP5ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc
984	.ENDIF	1056	.ENDIF
985	.IF "$(APP5VERINFO)" != ""	1057	.IF "$(APP5VERINFO)" != ""
986	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc	1058	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
Lines 989-994 Link Here
989	.ENDIF # "$(USE_SHELL)"=="4nt"	1061	.ENDIF # "$(USE_SHELL)"=="4nt"
990	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc	1062	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
991	.ENDIF # "$(APP5LINKRES)" != ""	1063	.ENDIF # "$(APP5LINKRES)" != ""
		1064	.IF "$(COM)" == "GCC"
		1065	@+echo mingw
		1066	.IF "$(APP5LINKRES)" != "" \|\| "$(APP5RES)" != ""
		1067	@cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.RES
		1068	windres $(MISC)$/$(@:b)_all.RES $(APP5RESO)
		1069	.ENDIF
		1070	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1071	$(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
		1072	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \
		1073	`$(TYPE) /dev/null $(APP5LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1074	$(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) > $(MISC)$/$(@:b).cmd
		1075	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1076	@+source $(MISC)$/$(@:b).cmd
		1077	@ls -l $@
		1078	.ELSE
992	.IF "$(linkinc)" == ""	1079	.IF "$(linkinc)" == ""
993	$(LINK) @$(mktmp \	1080	$(LINK) @$(mktmp \
994	$(LINKFLAGS) \	1081	$(LINKFLAGS) \
Lines 1025-1030 Link Here
1025	+if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst >> $(MISC)\$(APP5TARGET).lnk	1112	+if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst >> $(MISC)\$(APP5TARGET).lnk
1026	$(LINK) @$(MISC)\$(APP5TARGET).lnk	1113	$(LINK) @$(MISC)\$(APP5TARGET).lnk
1027	.ENDIF # "$(linkinc)" == ""	1114	.ENDIF # "$(linkinc)" == ""
		1115	.ENDIF
1028	.IF "$(APP5TARGET)" == "loader"	1116	.IF "$(APP5TARGET)" == "loader"
1029	+$(PERL) loader.pl $@	1117	+$(PERL) loader.pl $@
1030	.IF "$(USE_SHELL)"=="4nt"	1118	.IF "$(USE_SHELL)"=="4nt"
Lines 1194-1200 Link Here
1194	.ENDIF	1282	.ENDIF
1195	.ELSE # "$(USE_SHELL)"=="4nt"	1283	.ELSE # "$(USE_SHELL)"=="4nt"
1196	.IF "$(APP6ICON)" != ""	1284	.IF "$(APP6ICON)" != ""
1197	@-+guw.pl echo 1 ICON \"$(APP6ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc	1285	@-+$(WRAPCMD) echo 1 ICON \"$(APP6ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc
1198	.ENDIF	1286	.ENDIF
1199	.IF "$(APP6VERINFO)" != ""	1287	.IF "$(APP6VERINFO)" != ""
1200	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc	1288	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
Lines 1203-1208 Link Here
1203	.ENDIF # "$(USE_SHELL)"=="4nt"	1291	.ENDIF # "$(USE_SHELL)"=="4nt"
1204	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc	1292	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
1205	.ENDIF # "$(APP6LINKRES)" != ""	1293	.ENDIF # "$(APP6LINKRES)" != ""
		1294	.IF "$(COM)" == "GCC"
		1295	@+echo mingw
		1296	.IF "$(APP6LINKRES)" != "" \|\| "$(APP6RES)" != ""
		1297	@cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.RES
		1298	windres $(MISC)$/$(@:b)_all.RES $(APP6RESO)
		1299	.ENDIF
		1300	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1301	$(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
		1302	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \
		1303	`$(TYPE) /dev/null $(APP6LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1304	$(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) > $(MISC)$/$(@:b).cmd
		1305	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1306	@+source $(MISC)$/$(@:b).cmd
		1307	@ls -l $@
		1308	.ELSE
1206	.IF "$(linkinc)" == ""	1309	.IF "$(linkinc)" == ""
1207	$(LINK) @$(mktmp \	1310	$(LINK) @$(mktmp \
1208	$(LINKFLAGS) \	1311	$(LINKFLAGS) \
Lines 1239-1244 Link Here
1239	+if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst >> $(MISC)\$(APP6TARGET).lnk	1342	+if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst >> $(MISC)\$(APP6TARGET).lnk
1240	$(LINK) @$(MISC)\$(APP6TARGET).lnk	1343	$(LINK) @$(MISC)\$(APP6TARGET).lnk
1241	.ENDIF # "$(linkinc)" == ""	1344	.ENDIF # "$(linkinc)" == ""
		1345	.ENDIF
1242	.IF "$(APP6TARGET)" == "loader"	1346	.IF "$(APP6TARGET)" == "loader"
1243	+$(PERL) loader.pl $@	1347	+$(PERL) loader.pl $@
1244	.IF "$(USE_SHELL)"=="4nt"	1348	.IF "$(USE_SHELL)"=="4nt"
Lines 1408-1414 Link Here
1408	.ENDIF	1512	.ENDIF
1409	.ELSE # "$(USE_SHELL)"=="4nt"	1513	.ELSE # "$(USE_SHELL)"=="4nt"
1410	.IF "$(APP7ICON)" != ""	1514	.IF "$(APP7ICON)" != ""
1411	@-+guw.pl echo 1 ICON \"$(APP7ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc	1515	@-+$(WRAPCMD) echo 1 ICON \"$(APP7ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc
1412	.ENDIF	1516	.ENDIF
1413	.IF "$(APP7VERINFO)" != ""	1517	.IF "$(APP7VERINFO)" != ""
1414	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc	1518	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
Lines 1417-1422 Link Here
1417	.ENDIF # "$(USE_SHELL)"=="4nt"	1521	.ENDIF # "$(USE_SHELL)"=="4nt"
1418	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc	1522	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
1419	.ENDIF # "$(APP7LINKRES)" != ""	1523	.ENDIF # "$(APP7LINKRES)" != ""
		1524	.IF "$(COM)" == "GCC"
		1525	@+echo mingw
		1526	.IF "$(APP7LINKRES)" != "" \|\| "$(APP7RES)" != ""
		1527	@cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.RES
		1528	windres $(MISC)$/$(@:b)_all.RES $(APP7RESO)
		1529	.ENDIF
		1530	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1531	$(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
		1532	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \
		1533	`$(TYPE) /dev/null $(APP7LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1534	$(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) > $(MISC)$/$(@:b).cmd
		1535	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1536	@+source $(MISC)$/$(@:b).cmd
		1537	@ls -l $@
		1538	.ELSE
1420	.IF "$(linkinc)" == ""	1539	.IF "$(linkinc)" == ""
1421	$(LINK) @$(mktmp \	1540	$(LINK) @$(mktmp \
1422	$(LINKFLAGS) \	1541	$(LINKFLAGS) \
Lines 1453-1458 Link Here
1453	+if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst >> $(MISC)\$(APP7TARGET).lnk	1572	+if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst >> $(MISC)\$(APP7TARGET).lnk
1454	$(LINK) @$(MISC)\$(APP7TARGET).lnk	1573	$(LINK) @$(MISC)\$(APP7TARGET).lnk
1455	.ENDIF # "$(linkinc)" == ""	1574	.ENDIF # "$(linkinc)" == ""
		1575	.ENDIF
1456	.IF "$(APP7TARGET)" == "loader"	1576	.IF "$(APP7TARGET)" == "loader"
1457	+$(PERL) loader.pl $@	1577	+$(PERL) loader.pl $@
1458	.IF "$(USE_SHELL)"=="4nt"	1578	.IF "$(USE_SHELL)"=="4nt"
Lines 1622-1628 Link Here
1622	.ENDIF	1742	.ENDIF
1623	.ELSE # "$(USE_SHELL)"=="4nt"	1743	.ELSE # "$(USE_SHELL)"=="4nt"
1624	.IF "$(APP8ICON)" != ""	1744	.IF "$(APP8ICON)" != ""
1625	@-+guw.pl echo 1 ICON \"$(APP8ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc	1745	@-+$(WRAPCMD) echo 1 ICON \"$(APP8ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc
1626	.ENDIF	1746	.ENDIF
1627	.IF "$(APP8VERINFO)" != ""	1747	.IF "$(APP8VERINFO)" != ""
1628	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc	1748	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
Lines 1631-1636 Link Here
1631	.ENDIF # "$(USE_SHELL)"=="4nt"	1751	.ENDIF # "$(USE_SHELL)"=="4nt"
1632	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc	1752	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
1633	.ENDIF # "$(APP8LINKRES)" != ""	1753	.ENDIF # "$(APP8LINKRES)" != ""
		1754	.IF "$(COM)" == "GCC"
		1755	@+echo mingw
		1756	.IF "$(APP8LINKRES)" != "" \|\| "$(APP8RES)" != ""
		1757	@cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.RES
		1758	windres $(MISC)$/$(@:b)_all.RES $(APP8RESO)
		1759	.ENDIF
		1760	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1761	$(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
		1762	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \
		1763	`$(TYPE) /dev/null $(APP8LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1764	$(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) > $(MISC)$/$(@:b).cmd
		1765	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1766	@+source $(MISC)$/$(@:b).cmd
		1767	@ls -l $@
		1768	.ELSE
1634	.IF "$(linkinc)" == ""	1769	.IF "$(linkinc)" == ""
1635	$(LINK) @$(mktmp \	1770	$(LINK) @$(mktmp \
1636	$(LINKFLAGS) \	1771	$(LINKFLAGS) \
Lines 1667-1672 Link Here
1667	+if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst >> $(MISC)\$(APP8TARGET).lnk	1802	+if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst >> $(MISC)\$(APP8TARGET).lnk
1668	$(LINK) @$(MISC)\$(APP8TARGET).lnk	1803	$(LINK) @$(MISC)\$(APP8TARGET).lnk
1669	.ENDIF # "$(linkinc)" == ""	1804	.ENDIF # "$(linkinc)" == ""
		1805	.ENDIF
1670	.IF "$(APP8TARGET)" == "loader"	1806	.IF "$(APP8TARGET)" == "loader"
1671	+$(PERL) loader.pl $@	1807	+$(PERL) loader.pl $@
1672	.IF "$(USE_SHELL)"=="4nt"	1808	.IF "$(USE_SHELL)"=="4nt"
Lines 1836-1842 Link Here
1836	.ENDIF	1972	.ENDIF
1837	.ELSE # "$(USE_SHELL)"=="4nt"	1973	.ELSE # "$(USE_SHELL)"=="4nt"
1838	.IF "$(APP9ICON)" != ""	1974	.IF "$(APP9ICON)" != ""
1839	@-+guw.pl echo 1 ICON \"$(APP9ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc	1975	@-+$(WRAPCMD) echo 1 ICON \"$(APP9ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc
1840	.ENDIF	1976	.ENDIF
1841	.IF "$(APP9VERINFO)" != ""	1977	.IF "$(APP9VERINFO)" != ""
1842	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc	1978	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
Lines 1845-1850 Link Here
1845	.ENDIF # "$(USE_SHELL)"=="4nt"	1981	.ENDIF # "$(USE_SHELL)"=="4nt"
1846	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc	1982	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
1847	.ENDIF # "$(APP9LINKRES)" != ""	1983	.ENDIF # "$(APP9LINKRES)" != ""
		1984	.IF "$(COM)" == "GCC"
		1985	@+echo mingw
		1986	.IF "$(APP9LINKRES)" != "" \|\| "$(APP9RES)" != ""
		1987	@cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.RES
		1988	windres $(MISC)$/$(@:b)_all.RES $(APP9RESO)
		1989	.ENDIF
		1990	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		1991	$(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
		1992	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \
		1993	`$(TYPE) /dev/null $(APP9LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		1994	$(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) > $(MISC)$/$(@:b).cmd
		1995	@+$(TYPE) $(MISC)$/$(@:b).cmd
		1996	@+source $(MISC)$/$(@:b).cmd
		1997	@ls -l $@
		1998	.ELSE
1848	.IF "$(linkinc)" == ""	1999	.IF "$(linkinc)" == ""
1849	$(LINK) @$(mktmp \	2000	$(LINK) @$(mktmp \
1850	$(LINKFLAGS) \	2001	$(LINKFLAGS) \
Lines 1881-1886 Link Here
1881	+if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst >> $(MISC)\$(APP9TARGET).lnk	2032	+if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst >> $(MISC)\$(APP9TARGET).lnk
1882	$(LINK) @$(MISC)\$(APP9TARGET).lnk	2033	$(LINK) @$(MISC)\$(APP9TARGET).lnk
1883	.ENDIF # "$(linkinc)" == ""	2034	.ENDIF # "$(linkinc)" == ""
		2035	.ENDIF
1884	.IF "$(APP9TARGET)" == "loader"	2036	.IF "$(APP9TARGET)" == "loader"
1885	+$(PERL) loader.pl $@	2037	+$(PERL) loader.pl $@
1886	.IF "$(USE_SHELL)"=="4nt"	2038	.IF "$(USE_SHELL)"=="4nt"
Lines 2050-2056 Link Here
2050	.ENDIF	2202	.ENDIF
2051	.ELSE # "$(USE_SHELL)"=="4nt"	2203	.ELSE # "$(USE_SHELL)"=="4nt"
2052	.IF "$(APP10ICON)" != ""	2204	.IF "$(APP10ICON)" != ""
2053	@-+guw.pl echo 1 ICON \"$(APP10ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc	2205	@-+$(WRAPCMD) echo 1 ICON \"$(APP10ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc
2054	.ENDIF	2206	.ENDIF
2055	.IF "$(APP10VERINFO)" != ""	2207	.IF "$(APP10VERINFO)" != ""
2056	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc	2208	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
Lines 2059-2064 Link Here
2059	.ENDIF # "$(USE_SHELL)"=="4nt"	2211	.ENDIF # "$(USE_SHELL)"=="4nt"
2060	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc	2212	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
2061	.ENDIF # "$(APP10LINKRES)" != ""	2213	.ENDIF # "$(APP10LINKRES)" != ""
		2214	.IF "$(COM)" == "GCC"
		2215	@+echo mingw
		2216	.IF "$(APP10LINKRES)" != "" \|\| "$(APP10RES)" != ""
		2217	@cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.RES
		2218	windres $(MISC)$/$(@:b)_all.RES $(APP10RESO)
		2219	.ENDIF
		2220	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		2221	$(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
		2222	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \
		2223	`$(TYPE) /dev/null $(APP10LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		2224	$(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) > $(MISC)$/$(@:b).cmd
		2225	@+$(TYPE) $(MISC)$/$(@:b).cmd
		2226	@+source $(MISC)$/$(@:b).cmd
		2227	@ls -l $@
		2228	.ELSE
2062	.IF "$(linkinc)" == ""	2229	.IF "$(linkinc)" == ""
2063	$(LINK) @$(mktmp \	2230	$(LINK) @$(mktmp \
2064	$(LINKFLAGS) \	2231	$(LINKFLAGS) \
Lines 2095-2100 Link Here
2095	+if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst >> $(MISC)\$(APP10TARGET).lnk	2262	+if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst >> $(MISC)\$(APP10TARGET).lnk
2096	$(LINK) @$(MISC)\$(APP10TARGET).lnk	2263	$(LINK) @$(MISC)\$(APP10TARGET).lnk
2097	.ENDIF # "$(linkinc)" == ""	2264	.ENDIF # "$(linkinc)" == ""
		2265	.ENDIF
2098	.IF "$(APP10TARGET)" == "loader"	2266	.IF "$(APP10TARGET)" == "loader"
2099	+$(PERL) loader.pl $@	2267	+$(PERL) loader.pl $@
2100	.IF "$(USE_SHELL)"=="4nt"	2268	.IF "$(USE_SHELL)"=="4nt"

Lines 88-97 Link Here

(-)solenv/inc/wnt.mk.orig (-39 / +79 lines)
88	# --- Set Wrapper command ---	88	# --- Set Wrapper command ---
89	.IF "$(GUI)"=="WNT"	89	.IF "$(GUI)"=="WNT"
90	.IF "$(USE_SHELL)"!= "4nt"	90	.IF "$(USE_SHELL)"!= "4nt"
91	.IF "$(COM)" == "MSC" \|\| "$(COM)" == "GCC"	91	.IF "$(COM)" == "MSC"
92	#Fallback, normaly set by winenv.*	92	#Fallback, normaly set by winenv.*
93	WRAPCMD*=guw.pl	93	WRAPCMD*=guw.pl
94	.ENDIF	94	.ENDIF
		95	.IF "$(COM)" == "GCC"
		96	#Fallback, normaly set by winenv.*
		97	WRAPCMD*=gum.pl
		98	.ENDIF
95	.ENDIF	99	.ENDIF
96	.ENDIF	100	.ENDIF
97		101
Lines 164-170 Link Here
164	#.ENDIF	168	#.ENDIF
165		169
166	#.IF"$(bndchk)"==""	170	#.IF"$(bndchk)"==""
167	.IF "$(COMEX)"=="8"	171	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
168	CFLAGS+=-Zm500 -wd4290 -wd4786 -wd4800	172	CFLAGS+=-Zm500 -wd4290 -wd4786 -wd4800
169	.ENDIF	173	.ENDIF
170	#.ENDIF	174	#.ENDIF
Lines 263-273 Link Here
263	CFLAGSOPT=-Ox -Oy-	267	CFLAGSOPT=-Ox -Oy-
264	CFLAGSNOOPT=-Od	268	CFLAGSNOOPT=-Od
265	CFLAGSOUTOBJ=-Fo	269	CFLAGSOUTOBJ=-Fo
266	.IF "$(COMEX)"=="8"	270	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
267	CFLAGSWALL=-Wall -wd4294 -wd4640	271	CFLAGSWALL=-Wall -wd4294 -wd4640
268	.ELSE # "$(COMEX)"=="8"	272	.ELSE # "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
269	CFLAGSWALL=-W4	273	CFLAGSWALL=-W4
270	.ENDIF # "$(COMEX)"=="8"	274	.ENDIF # "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
271	CFLAGSDFLTWARN=-W3	275	CFLAGSDFLTWARN=-W3
272		276
273	.IF "$(syntax)"!=""	277	.IF "$(syntax)"!=""
Lines 295-301 Link Here
295	CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400	299	CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400
296	CDEFS+=-D_MT	300	CDEFS+=-D_MT
297	.ENDIF	301	.ENDIF
298	.IF "$(COMEX)"=="8"	302	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
299	#CDEFS+=-D__STL_NO_NEW_IOSTREAMS -DSTLPORT_VERSION=450 -D__STL_USE_ABBREVS	303	#CDEFS+=-D__STL_NO_NEW_IOSTREAMS -DSTLPORT_VERSION=450 -D__STL_USE_ABBREVS
300	CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400	304	CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400
301	CDEFS+=-D_MT	305	CDEFS+=-D_MT
Lines 366-377 Link Here
366		370
367	.IF "$(DYNAMIC_CRT)"!=""	371	.IF "$(DYNAMIC_CRT)"!=""
368	LIBCMT=msvcrt.lib	372	LIBCMT=msvcrt.lib
369	LIBCIMT=msvcirt.lib	373	#LIBCIMT=msvcirt.lib
370	OLDNAMES=oldnames.lib	374	OLDNAMES=oldnames.lib
371	UWINAPILIB*=uwinapi.lib	375	UWINAPILIB*=uwinapi.lib
372	.ELSE	376	.ELSE
373	LIBCMT=libcmt.lib	377	LIBCMT=libcmt.lib
374	LIBCIMT=libcimt.lib	378	#LIBCIMT=libcimt.lib
375	OLDNAMES=oldnames.lib	379	OLDNAMES=oldnames.lib
376	UWINAPILIB*=uwinapi.lib	380	UWINAPILIB*=uwinapi.lib
377	.ENDIF	381	.ENDIF
Lines 401-414 Link Here
401	STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib $(OLDNAMES)	405	STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib $(OLDNAMES)
402	.ENDIF	406	.ENDIF
403		407
404	.IF "$(COMEX)"!="8"	408	.IF "$(COMEX)"=="8" \|\| "$(COMEX)"=="10"
405	LIBSTLPORT=stlport_vc6.lib
406	LIBSTLPORTST=stlport_vc6_static.lib
407	ATL_INCLUDE=$(COMPATH)$/atl$/include
408	.ELSE
409	LIBSTLPORT=stlport_vc7.lib	409	LIBSTLPORT=stlport_vc7.lib
410	LIBSTLPORTST=stlport_vc7_static.lib	410	LIBSTLPORTST=stlport_vc7_static.lib
411	ATL_INCLUDE=$(COMPATH)$/atlmfc$/include	411	ATL_INCLUDE=$(COMPATH)$/atlmfc$/include
		412	.ELSE
		413	LIBSTLPORT=stlport_vc6.lib
		414	LIBSTLPORTST=stlport_vc6_static.lib
		415	ATL_INCLUDE=$(COMPATH)$/atl$/include
412	.ENDIF	416	.ENDIF
413		417
414	.IF "$(USE_SHELL)"=="4nt"	418	.IF "$(USE_SHELL)"=="4nt"
Lines 470-489 Link Here
470	#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)	474	#CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF)
471	# new:	475	# new:
472	CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /)	476	CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /)
473	CFLAGS=-c -Wall -I$(CYGINC) $(OLE2DEF)	477	CFLAGS=-fmessage-length=0 -c -Wall -I$(CYGINC) $(OLE2DEF)
		478
		479	# flags to enable build with symbols; required for crashdump feature
		480	.IF "$(ENABLE_SYMBOLS)"=="SMALL"
		481	CFLAGSENABLESYMBOLS=-g1
		482	.ELSE
		483	CFLAGSENABLESYMBOLS=-g
		484	.ENDIF
		485
474	###	486	###
475	CFLAGS+=-nostdinc -fPIC	487	CFLAGS+=-nostdinc
476	CFLAGSCC=-pipe -mpentium	488	CFLAGSCC=-pipe -march=pentiumpro
477	CFLAGSCXX=-pipe -mpentium -fguiding-decls	489	CFLAGSCXX=-pipe -march=pentiumpro -fno-for-scope -fpermissive
478	CFLAGSEXCEPTIONS=-fexceptions	490	CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
479	CFLAGS_NO_EXCEPTIONS=-fno-exceptions	491	CFLAGS_NO_EXCEPTIONS=-fno-exceptions
480		492
481	CFLAGSOBJGUIST=-DWIN32	493	CFLAGSOBJGUIST=-DWIN32 -DWINVER=0x0500 -D_DLL
482	CFLAGSOBJCUIST=-DWIN32	494	CFLAGSOBJCUIST=-DWIN32 -DWINVER=0x0500 -D_DLL
483	CFLAGSOBJGUIMT=-DWIN32	495	CFLAGSOBJGUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL
484	CFLAGSOBJCUIMT=-DWIN32	496	CFLAGSOBJCUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL
485	CFLAGSSLOGUIMT=-DWIN32 -fPIC	497	CFLAGSSLOGUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL
486	CFLAGSSLOCUIMT=-DWIN32 -fPIC	498	CFLAGSSLOCUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL
487	CFLAGSPROF=	499	CFLAGSPROF=
488	CFLAGSDEBUG=-g	500	CFLAGSDEBUG=-g
489	CFLAGSDBGUTIL=	501	CFLAGSDBGUTIL=
Lines 492-528 Link Here
492	CFLAGSOUTOBJ=-o	504	CFLAGSOUTOBJ=-o
493	#plattform hart setzen	505	#plattform hart setzen
494	CDEFS+=-D_M_IX86	506	CDEFS+=-D_M_IX86
		507	CDEFS+=-DSTLPORT_VERSION=450 -D_STLP_USE_DYNAMIC_LIB
495		508
496	STATIC= -static	509	STATIC= -static
497	DYNAMIC= -dynamic	510	DYNAMIC= -dynamic
498		511
499	LINK*=ld	512	LINK*=ld
500	CYGLIB=$(LIB:s/;/ -L/)	513	CYGLIB=$(LIB:s/;/ -L/)
501	LINKFLAGS=-nodefaultlibs -L$(CYGLIB)	514	LINKFLAGS=-Wl,--enable-runtime-pseudo-reloc -L$(CYGLIB)
502	LINKFLAGSAPPGUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o	515	LINKFLAGSAPPGUI=-Wl,--enable-stdcall-fixup
503	LINKFLAGSSHLGUI=--warn-once	516	LINKFLAGSSHLGUI=-Wl,--enable-stdcall-fixup -shared --warn-once
504	LINKFLAGSAPPCUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o	517	LINKFLAGSAPPCUI=-Wl,--enable-stdcall-fixup
505	LINKFLAGSSHLCUI=--warn-once	518	LINKFLAGSSHLCUI=-Wl,--enable-stdcall-fixup -shared --warn-once
506	LINKFLAGSTACK=	519	LINKFLAGSTACK=
507	LINKFLAGSPROF=	520	LINKFLAGSPROF=
508	LINKFLAGSDEBUG=-g	521	LINKFLAGSDEBUG=-g
509	LINKFLAGSOPT=	522	LINKFLAGSOPT=
510		523
511	STDLIBCPP=-lstdc++	524	STDLIBCPP=$(STATIC) -lstdc++ $(DYNAMIC)
		525	UWINAPILIB*=$(DYNAMIC) -luwinapi
512		526
513	STDOBJVCL=$(L)$/salmain.obj	527	STDOBJVCL=$(L)$/salmain.obj
514	STDOBJGUI=	528	STDOBJGUI=
515	STDSLOGUI=	529	STDSLOGUI=
516	STDOBJCUI=	530	STDOBJCUI=
517	STDSLOCUI=	531	STDSLOCUI=
518	STDLIBGUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32	532	STDLIBGUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
519	STDLIBCUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32	533	STDLIBCUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
520	STDLIBGUIMT=-dynamic -ldl -lm -lmingw32 -lkernel32 -luser32 -lgcc -lmoldname	534	STDLIBGUIMT=$(STATIC) -lmingw32 -lgcc -lstdc++ -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
521	STDLIBGUIMT+= -lmsvcrt -lcrtdll -luser32	535	STDLIBGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE
522	STDLIBCUIMT=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lpthread -lm -lkernel32 -luser32	536	STDLIBCUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
523	STDSHLGUIMT=-dynamic -ldl -lm -lkernel32 -luser32 -lmingw32 -lgcc	537	STDLIBCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE
524	STDSHLGUIMT+= -lmoldname -lmsvcrt -lcrtdll -luser32	538	STDSHLGUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
525	STDSHLCUIMT=-dynamic -ldl -lm -lkernel32 -luser32	539	STDSHLGUIST+= -lmsvcrt -lcrtdll
		540	STDSHLCUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
		541	STDSHLCUIST+= -lmsvcrt -lcrtdll
		542	STDSHLGUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
		543	STDSHLGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE
		544	STDSHLCUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32
		545	STDSHLCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE
		546
		547	LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP)
		548	LIBSTLPORTST=$(STATIC) -lstlport_gcc_static $(DYNAMIC) $(STDLIBCPP)
		549
		550	PWD:=`cygpath -m $(PWD)`
526		551
527	LIBMGR=ar	552	LIBMGR=ar
528	LIBFLAGS=-rsu	553	LIBFLAGS=-rsu
Lines 534-546 Link Here
534	MAPSYMFLAGS=	559	MAPSYMFLAGS=
535		560
536	RC=rc	561	RC=rc
537	RCFLAGS=-DWIN32 -fo$@ $(RCFILES)	562	RCFLAGS=-D__MINGW32__ -DWIN32 -fo$@ $(RCFILES)
538	RCLINK=	563	RCLINK=
539	RCLINKFLAGS=	564	RCLINKFLAGS=
540	RCSETVERSION=	565	RCSETVERSION=
541		566
542	DLLPOSTFIX=gi	567	DLLPOSTFIX=gi
543		568
		569	IDLC=$(WRAPCMD) idlc
		570	REGMERGE=$(WRAPCMD) regmerge
		571	REGCOMPARE=$(WRAPCMD) regcompare
		572	REGCOMP=$(WRAPCMD) regcomp
		573	CPPUMAKER=$(WRAPCMD) cppumaker
		574	JAVAMAKER=$(WRAPCMD) javamaker
		575	RDBMAKER=$(WRAPCMD) rdbmaker
		576	STARDEP=$(WRAPCMD) javadep
		577	JAVAC=$(WRAPCMD) javac
		578	JAVA=$(WRAPCMD) java
		579	SCPCOMP=$(WRAPCMD) scpcomp
		580	SCPLINK=$(WRAPCMD) scplink
		581	LZIP=$(WRAPCMD) -env lzip
		582	CPPLCC=$(WRAPCMD) cpplcc
		583
544	.ENDIF	584	.ENDIF
545	.ENDIF	585	.ENDIF
546	# --- Windows-NT Allgemein ---	586	# --- Windows-NT Allgemein ---

Lines 68-76 Link Here

(-)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 73-82 Link Here

(-)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 24-30 Link Here

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





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

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_1IMPLIB_DEPS=$(LB)$/$(SHL1IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL1DEF=$(SHL1DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL1ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL1ARCHIV).a --output-exp $(LB)$/lib$(SHL1TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_2IMPLIB_DEPS=$(LB)$/$(SHL2IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL2DEF=$(SHL2DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL2ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL2ARCHIV).a --output-exp $(LB)$/lib$(SHL2TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_3IMPLIB_DEPS=$(LB)$/$(SHL3IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL3DEF=$(SHL3DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL3ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL3ARCHIV).a --output-exp $(LB)$/lib$(SHL3TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_4IMPLIB_DEPS=$(LB)$/$(SHL4IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL4DEF=$(SHL4DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL4ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL4ARCHIV).a --output-exp $(LB)$/lib$(SHL4TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_5IMPLIB_DEPS=$(LB)$/$(SHL5IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL5DEF=$(SHL5DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL5ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL5ARCHIV).a --output-exp $(LB)$/lib$(SHL5TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_6IMPLIB_DEPS=$(LB)$/$(SHL6IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL6DEF=$(SHL6DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL6ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL6ARCHIV).a --output-exp $(LB)$/lib$(SHL6TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_7IMPLIB_DEPS=$(LB)$/$(SHL7IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL7DEF=$(SHL7DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL7ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL7ARCHIV).a --output-exp $(LB)$/lib$(SHL7TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_8IMPLIB_DEPS=$(LB)$/$(SHL8IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL8DEF=$(SHL8DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL8ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL8ARCHIV).a --output-exp $(LB)$/lib$(SHL8TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_9IMPLIB_DEPS=$(LB)$/$(SHL9IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL9DEF=$(SHL9DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL9ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL9ARCHIV).a --output-exp $(LB)$/lib$(SHL9TARGET).exp
	@+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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_10IMPLIB_DEPS=$(LB)$/$(SHL10IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL10DEF=$(SHL10DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL10ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL10ARCHIV).a --output-exp $(LB)$/lib$(SHL10TARGET).exp
	@+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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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
	@+-$(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)" != ""

.ENDIF			# "$(COM)" == "MSC"

.IF "$(USE_DEFFILE)"==""
.IF "$(COM)" != "GCC"
USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib
.ENDIF
.ENDIF			# "$(USE_DEFFILE)"==""
.ENDIF			# "$(GUI)" == "WNT"
USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)

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) `cygpath -m $(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) --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) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a
.ELSE			# "$(USE_DEFFILE)"!=""
	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).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,$(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
	@+-$(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)"==""

Lines 910-915 Link Here

(-)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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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!:=$(LB)$/$(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 118-126 Link Here

(-)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 66-72 Link Here

(-)solenv/inc/libs.mk.orig (-1 / +40 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-84 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=$(STATIC) -lgpc_static $(DYNAMIC)
		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)
Lines 95-101 Link Here
95	RTLLIB=	103	RTLLIB=
96	TECLIB=	104	TECLIB=
97	CPPULIB=-lcppu	105	CPPULIB=-lcppu
		106	.IF "$(GUI)"=="WNT"
		107	CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
		108	.ELSE
98	CPPUHELPERLIB=-lcppuhelper$(COMID)	109	CPPUHELPERLIB=-lcppuhelper$(COMID)
		110	.ENDIF
99	.INCLUDE .IGNORE : ucbhelper$/version.mk	111	.INCLUDE .IGNORE : ucbhelper$/version.mk
100	UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)	112	UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
101	REGLIB=-lreg	113	REGLIB=-lreg
Lines 112-118 Link Here
112	SALTLSLIB=-lsaltls$(UDK_MAJOR)	124	SALTLSLIB=-lsaltls$(UDK_MAJOR)
113	SALZIPLIB=-lsalzip$(UDK_MAJOR)	125	SALZIPLIB=-lsalzip$(UDK_MAJOR)
114	RMCXTLIB=-lrmcxt	126	RMCXTLIB=-lrmcxt
		127	.IF "$(GUI)$(COM)"=="WNTGCC"
		128	BTSTRPLIB=$(STATIC) -lbtstrp_static $(DYNAMIC)
		129	.ELSE
115	BTSTRPLIB=-lbtstrp	130	BTSTRPLIB=-lbtstrp
		131	.ENDIF
116	TRANSEXLIB=-ltransex	132	TRANSEXLIB=-ltransex
117	IOTXLIB=	133	IOTXLIB=
118	OTXLIB=-lotx_ind	134	OTXLIB=-lotx_ind
Lines 129-135 Link Here
129	LDAPSDKLIB=-lldap50	145	LDAPSDKLIB=-lldap50
130	ONELIB=	146	ONELIB=
131	UNOLIB=	147	UNOLIB=
		148	.IF "$(GUI)$(COM)"=="WNTGCC"
		149	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX).a
		150	.ELSE
132	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX)$(DLLPOST)	151	SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX)$(DLLPOST)
		152	.ENDIF
133	SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX)	153	SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX)
134	ICOLIB=-lico$(OFFICEUPD)$(DLLPOSTFIX)	154	ICOLIB=-lico$(OFFICEUPD)$(DLLPOSTFIX)
135	BSTRPLIB=-lbtstrp	155	BSTRPLIB=-lbtstrp
Lines 171-183 Link Here
171	HM2LIBST=-lhmwrap	191	HM2LIBST=-lhmwrap
172	LINGULIB=$(HM2LIBST)	192	LINGULIB=$(HM2LIBST)
173	LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)	193	LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
		194	.IF "$(GUI)$(COM)"=="WNTGCC"
		195	EXPAT3RDLIB=$(STATIC) -lexpat_xmlparse_static -lexpat_xmltok_static $(DYNAMIC)
		196	EXPATASCII3RDLIB=$(STATIC) -lascii_expat_xmlparse_static -lexpat_xmltok_static $(DYNAMIC)
		197	ZLIB3RDLIB=$(STATIC) -lzlib_static $(DYNAMIC)
		198	.ELSE
174	EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok	199	EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
175	EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok	200	EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
176	ZLIB3RDLIB=-lzlib	201	ZLIB3RDLIB=-lzlib
		202	.ENDIF
		203	.IF "$(GUI)$(COM)"=="WNTGCC"
		204	JPEG3RDLIB=$(STATIC) -ljpeglib_static $(DYNAMIC)
		205	NEON3RDLIB=$(STATIC) -lneon_static $(DYNAMIC)
		206	.ELSE
177	JPEG3RDLIB=-ljpeglib	207	JPEG3RDLIB=-ljpeglib
178	NEON3RDLIB=-lneon	208	NEON3RDLIB=-lneon
		209	.ENDIF
179	BERKELEYLIB=-ldb-3.2	210	BERKELEYLIB=-ldb-3.2
		211	.IF "$(GUI)$(COM)"=="WNTGCC"
		212	BERKELEYCPPLIB=
		213	.ELSE
180	BERKELEYCPPLIB=-ldb_cxx-3.2	214	BERKELEYCPPLIB=-ldb_cxx-3.2
		215	.ENDIF
181	CURLLIB=-lcurl	216	CURLLIB=-lcurl
182	SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)	217	SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
183	SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)	218	SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
Lines 212-218 Link Here
212	PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX)	247	PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX)
213	SYSSHELLLIB=-lsysshell	248	SYSSHELLLIB=-lsysshell
214	SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX)	249	SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX)
		250	.IF "$(GUI)"=="WNT"
		251	JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
		252	.ELSE
215	JVMACCESSLIB = -ljvmaccess$(COMID)	253	JVMACCESSLIB = -ljvmaccess$(COMID)
		254	.ENDIF
216		255
217	#	256	#
218	# USED_%NAME%_LIBS	257	# USED_%NAME%_LIBS

Lines 113-118 Link Here

(-)solenv/inc/tg_app.mk.orig (-1 / +25 lines)
113	.ENDIF	113	.ENDIF
114	.ENDIF	114	.ENDIF
115		115
		116	APP$(TNR)RESO=
		117	.IF "$(GUI)" != "WNT" \|\| "$(COM)" != "GCC"
		118	.ELSE
		119	.IF "$(APP$(TNR)LINKRES)" != "" \|\| "$(APP$(TNR)RES)" != ""
		120	APP$(TNR)RESO=$(MISC)$/$(APP$(TNR)TARGET)_res.o
		121	.ENDIF
		122	.ENDIF
		123
116	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"	124	.IF "$(GUI)" != "WNT" \|\| "$(GUI)$(COM)"=="WNTBLC"
117	USE_APP$(TNR)DEF=$(APP$(TNR)DEF)	125	USE_APP$(TNR)DEF=$(APP$(TNR)DEF)
118	.ELSE	126	.ELSE
Lines 219-225 Link Here
219	.ENDIF	227	.ENDIF
220	.ELSE # "$(USE_SHELL)"=="4nt"	228	.ELSE # "$(USE_SHELL)"=="4nt"
221	.IF "$(APP$(TNR)ICON)" != ""	229	.IF "$(APP$(TNR)ICON)" != ""
222	@-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc	230	@-+$(WRAPCMD) echo 1 ICON \"$(APP$(TNR)ICON)\" \| sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
223	.ENDIF	231	.ENDIF
224	.IF "$(APP$(TNR)VERINFO)" != ""	232	.IF "$(APP$(TNR)VERINFO)" != ""
225	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc	233	@-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
Lines 228-233 Link Here
228	.ENDIF # "$(USE_SHELL)"=="4nt"	236	.ENDIF # "$(USE_SHELL)"=="4nt"
229	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc	237	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
230	.ENDIF # "$(APP$(TNR)LINKRES)" != ""	238	.ENDIF # "$(APP$(TNR)LINKRES)" != ""
		239	.IF "$(COM)" == "GCC"
		240	@+echo mingw
		241	.IF "$(APP$(TNR)LINKRES)" != "" \|\| "$(APP$(TNR)RES)" != ""
		242	@cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.RES
		243	windres $(MISC)$/$(@:b)_all.RES $(APP$(TNR)RESO)
		244	.ENDIF
		245	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
		246	$(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
		247	-Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
		248	`$(TYPE) /dev/null $(APP$(TNR)LIBS) \| sed s\#$(ROUT)\#$(OUT)\#g` \
		249	$(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(@:b).cmd
		250	@+$(TYPE) $(MISC)$/$(@:b).cmd
		251	@+source $(MISC)$/$(@:b).cmd
		252	@ls -l $@
		253	.ELSE
231	.IF "$(linkinc)" == ""	254	.IF "$(linkinc)" == ""
232	$(LINK) @$(mktmp \	255	$(LINK) @$(mktmp \
233	$(LINKFLAGS) \	256	$(LINKFLAGS) \
Lines 264-269 Link Here
264	+if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst >> $(MISC)\$(APP$(TNR)TARGET).lnk	287	+if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst >> $(MISC)\$(APP$(TNR)TARGET).lnk
265	$(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk	288	$(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk
266	.ENDIF # "$(linkinc)" == ""	289	.ENDIF # "$(linkinc)" == ""
		290	.ENDIF
267	.IF "$(APP$(TNR)TARGET)" == "loader"	291	.IF "$(APP$(TNR)TARGET)" == "loader"
268	+$(PERL) loader.pl $@	292	+$(PERL) loader.pl $@
269	.IF "$(USE_SHELL)"=="4nt"	293	.IF "$(USE_SHELL)"=="4nt"

Lines 172-180 Link Here

(-)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 71-79 Link Here

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




SVIDL=svidl
.ELSE
.IF "$(USE_SHELL)"!="4nt"
SVIDL=$(WRAPCMD) svidl.exe
.ELSE
SVIDL=svidl.exe
.ENDIF

.ENDIF
.ELSE
.IF "$(USE_SHELL)"!="4nt"
LDUMP=$(WRAPCMD) ldump4
LDUMP2=$(WRAPCMD) ldump4
.ELSE
LDUMP=ldump4
LDUMP2=ldump4

RSC=rscdep
.IF "$(GUI)"=="WNT"
.IF "$(USE_SHELL)"!="4nt"
RSC=$(WRAPCMD) rscdep
.ENDIF
.ENDIF
.ELSE
RSC=rsc
.IF "$(GUI)"=="WNT"
.IF "$(USE_SHELL)"!="4nt"
RSC=$(WRAPCMD) rsc
.ENDIF
.ENDIF
.ENDIF

.IF "$(NO_DEFAULT_STL)"==""
STDLIB+=$(LIBSTLPORT)
STDSHL+=$(LIBSTLPORT)
.ELSE
STDLIB+=$(STDLIBCPP)
STDSHL+=$(STDLIBCPP)
.ENDIF			# "$(NO_DEFAULT_STL)"==""

# fill up unresolved symbols not found else where

Lines 87-99 Link Here

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




# procedures

#----------------------------------------------------------
# Function name: MingWCygwinFormat
# Description:   Format variables to Windows Format.
# Arguments:     1. Variable (string) with one token
# Return value:  Reformatted String
#----------------------------------------------------------
sub MingWCygwinFormat {
  my $variable = shift @_;
  my( $d1, $d1_prefix, $d2 );

  $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables
  $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice!
  $variable =~ s/:/;/g;
  $variable =~ s/([;]|\A|\A\s*-\w)(\w);/$1$2:/g; # get back the drives
  # Search for posix path ;entry; and replace with cygpath -w entry, accept quotes.
  while ( $variable =~ /(?:;|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:;|\Z)/ ) { # Normal paths
    if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nnormal path:\n$variable\n");};
	$d1 = $1 ;
	chomp( $d2 = qx{cygpath -m "$d1"} ) ;
	$variable =~ s/$d1/$d2/ ;
  }
  if ( $variable =~ /\A(-\w)[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end)
	# This regex: option -> $1, filename without quotes -> $2
    if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\ninclude path:\n$variable\n");};
	$d1_prefix = $1;
	$d1 = $2;
	# Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths
	if ( $d1 =~ / / ) {
		chomp( $d1 = qx{cygpath -m "$d1"} );
	} else {
		chomp( $d1 = qx{cygpath -m "$d1"} );
	}
	# "cygpath -m" returns "" if the file doesn't exist.
	if ($d1 eq "") {
	  $d1 = ".";
	  print(STDERR "Error: guw.pl: Option:$variable:\nhas a problem! Probably nonexistent filename with space.\n");

	$variable = $d1_prefix.$d1;
  }
  if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\- ~]+)+)/ ) {
	  print(STDERR "Error: guw.pl: MingWCygwinFormat: Not converted -X/... type switch in :$variable:.\n");
	  if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
  }
  $variable =~ s/\//\\/g;		# Remaining \ come from e.g.: ../foo/baa
  $variable =~ s/^\\$/\//g; # a single "/" needs to be preserved

  if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nresult:$variable\n");};
  return $variable;
}


		  print(CMD join(' ', @cmd_file));
		  close(CMD);
		  # convert '@filename' to dos style
		  $para = MingWCygwinFormat( $para );
		  if ( defined $debug ) { print(STDERR "----------------------------\n");};
		  if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");}
		  $para = "@".$para;

			}
		  }
		  if( $is_no_para ) {
			$para = MingWCygwinFormat($para);
		  }
		  if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );};
		} # else

        if ( defined $this_var )
        {
            if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );};
            $ENV{ $one_var } = MingWCygwinFormat( $this_var );
            if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );};
        }
    }

Return to issue 24588

Lines 166-172 Link Here

(-)solenv/inc/tg_shl.mk.orig (-11 / +39 lines)
166		166
167	.IF "$(GUI)" != "UNX"	167	.IF "$(GUI)" != "UNX"
168	.IF "$(GUI)" == "WNT"	168	.IF "$(GUI)" == "WNT"
169	.IF "$(COM)" == "MSC"	169	.IF "$(COM)" != "GCC"
170	.IF "$(SHL$(TNR)IMPLIB)" != ""	170	.IF "$(SHL$(TNR)IMPLIB)" != ""
171	USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib	171	USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib
172	.ELSE # "$(SHL$(TNR)IMPLIB)" != ""	172	.ELSE # "$(SHL$(TNR)IMPLIB)" != ""
Lines 175-181 Link Here
175	.ENDIF # "$(COM)" == "MSC"	175	.ENDIF # "$(COM)" == "MSC"
176		176
177	.IF "$(USE_DEFFILE)"==""	177	.IF "$(USE_DEFFILE)"==""
		178	.IF "$(COM)" != "GCC"
178	USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib	179	USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib
		180	.ENDIF
179	.ENDIF # "$(USE_DEFFILE)"==""	181	.ENDIF # "$(USE_DEFFILE)"==""
180	.ENDIF # "$(GUI)" == "WNT"	182	.ENDIF # "$(GUI)" == "WNT"
181	USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)	183	USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
Lines 275-280 Link Here
275	SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))	277	SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))
276	SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)	278	SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)
277	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res	279	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
		280	SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
278	.ENDIF # "$(SHL$(TNR)RES)"!=""	281	.ENDIF # "$(SHL$(TNR)RES)"!=""
279	.ENDIF	282	.ENDIF
280		283
Lines 282-287 Link Here
282	SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res	285	SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res
283	SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)	286	SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)
284	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res	287	SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
		288	SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
285	.ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""	289	.ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
286		290
287	.IF "$(NO_SHL$(TNR)DESCRIPTION)"==""	291	.IF "$(NO_SHL$(TNR)DESCRIPTION)"==""
Lines 324-330 Link Here
324	.IF "$(GUI)" == "WNT"	328	.IF "$(GUI)" == "WNT"
325	.IF "$(UPDATER)"=="YES"	329	.IF "$(UPDATER)"=="YES"
326	.IF "$(COM)"=="GCC"	330	.IF "$(COM)"=="GCC"
327	$(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c	331	$(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c
328	.ELSE	332	.ELSE
329	$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c	333	$(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
330	.ENDIF # "$(COM)"=="GCC"	334	.ENDIF # "$(COM)"=="GCC"
Lines 354-370 Link Here
354	+$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)	358	+$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)
355	.ELSE # "$(USE_SHELL)"=="4nt"	359	.ELSE # "$(USE_SHELL)"=="4nt"
356	+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)	360	+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
		361	.IF "$(COM)"=="GCC"
		362	windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
		363	.ENDIF # "$(COM)"=="GCC"
357	.ENDIF # "$(USE_SHELL)"=="4nt"	364	.ENDIF # "$(USE_SHELL)"=="4nt"
358	.ENDIF # "$(SHL$(TNR)ALLRES)"!=""	365	.ENDIF # "$(SHL$(TNR)ALLRES)"!=""
359	.IF "$(linkinc)"==""
360	.IF "$(USE_DEFFILE)"!=""
361	.IF "$(COM)"=="GCC"	366	.IF "$(COM)"=="GCC"
		367	.IF "$(USE_DEFFILE)"!=""
		368	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp
362	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \	369	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
363	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \| tr -d ï\r\nï > $(MISC)$/$(@:b).cmd	370	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
364	@+$(TYPE) $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g \| tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd	371	`$(TYPE) /dev/null $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
365	@+echo $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd	372	-Wl,$(MISC)$/$(@:b).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
366	$(MISC)$/$(@:b).cmd	373	-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
		374	@+$(TYPE) $(MISC)$/$(@:b).cmd
		375	@+source $(MISC)$/$(@:b).cmd
		376	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a
		377	.ELSE # "$(USE_DEFFILE)"!=""
		378	dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).exp
		379	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
		380	$(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
		381	`$(TYPE) /dev/null $(SHL$(TNR)LIBS) \| sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
		382	-Wl,$(LB)$/lib$(SHL$(TNR)TARGET).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \
		383	-Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd
		384	@+$(TYPE) $(MISC)$/$(@:b).cmd
		385	@+source $(MISC)$/$(@:b).cmd
		386	.ENDIF # "$(USE_DEFFILE)"!=""
367	.ELSE	387	.ELSE
		388	.IF "$(linkinc)"==""
		389	.IF "$(USE_DEFFILE)"!=""
368	$(LINK) @$(mktmp \	390	$(LINK) @$(mktmp \
369	$(LINKFLAGS) \	391	$(LINKFLAGS) \
370	$(LINKFLAGSSHL) \	392	$(LINKFLAGSSHL) \
Lines 380-386 Link Here
380	$(STDSHL) $(STDSHL$(TNR)) \	402	$(STDSHL) $(STDSHL$(TNR)) \
381	$(SHL$(TNR)LINKRES) \	403	$(SHL$(TNR)LINKRES) \
382	)	404	)
383	.ENDIF # "$(COM)"=="GCC"
384	.ELSE # "$(USE_DEFFILE)"!=""	405	.ELSE # "$(USE_DEFFILE)"!=""
385	$(LINK) @$(mktmp $(LINKFLAGS) \	406	$(LINK) @$(mktmp $(LINKFLAGS) \
386	$(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \	407	$(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
Lines 413-418 Link Here
413	+$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk	434	+$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
414	$(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk	435	$(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
415	.ENDIF # "$(linkinc)"==""	436	.ENDIF # "$(linkinc)"==""
		437	.ENDIF # "$(COM)"=="GCC"
416	.ENDIF # "$(GUI)" == "WNT"	438	.ENDIF # "$(GUI)" == "WNT"
417	.IF "$(GUI)"=="UNX"	439	.IF "$(GUI)"=="UNX"
418	.IF "$(UPDATER)"=="YES"	440	.IF "$(UPDATER)"=="YES"
Lines 593-606 Link Here
593	@echo ------------------------------	615	@echo ------------------------------
594	@echo Making: $(SHL$(TNR)IMPLIBN)	616	@echo Making: $(SHL$(TNR)IMPLIBN)
595	.IF "$(GUI)" == "WNT"	617	.IF "$(GUI)" == "WNT"
		618	.IF "$(COM)"=="GCC"
		619	@echo no ImportLibs on mingw
		620	@+-$(RM) $@
		621	@$(TOUCH) $@
		622	.ELSE # "$(COM)=="GCC"
596	# bei use_deffile implib von linker erstellt	623	# bei use_deffile implib von linker erstellt
597	.IF "$(USE_DEFFILE)"==""	624	.IF "$(USE_DEFFILE)"==""
598	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \	625	$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
599	-def:$(SHL$(TNR)DEF) )	626	-def:$(SHL$(TNR)DEF) )
600	.ELSE # "$(GUI)" == "WNT"	627	.ELSE # "$(USE_DEFFILE)==""
601	+$(TOUCH) $@	628	+$(TOUCH) $@
602	+@echo build of $(SHL$(TNR)TARGETN) creates $@	629	+@echo build of $(SHL$(TNR)TARGETN) creates $@
603	.ENDIF # "$(GUI)" == "WNT"	630	.ENDIF # "$(USE_DEFFILE)==""
		631	.ENDIF # "$(COM)"=="GCC"
604	.ELSE	632	.ELSE
605	.IF "$(GUI)" == "WIN" \|\| "$(GUI)" == "OS2"	633	.IF "$(GUI)" == "WIN" \|\| "$(GUI)" == "OS2"
606	.IF "$(USE_DEFFILE)"==""	634	.IF "$(USE_DEFFILE)"==""

Lines 1101-1107 Link Here

(-)solenv/inc/settings.mk.orig (-5 / +8 lines)
1101	SVIDL=svidl	1101	SVIDL=svidl
1102	.ELSE	1102	.ELSE
1103	.IF "$(USE_SHELL)"!="4nt"	1103	.IF "$(USE_SHELL)"!="4nt"
1104	SVIDL=guw.pl svidl.exe	1104	SVIDL=$(WRAPCMD) svidl.exe
1105	.ELSE	1105	.ELSE
1106	SVIDL=svidl.exe	1106	SVIDL=svidl.exe
1107	.ENDIF	1107	.ENDIF
Lines 1113-1120 Link Here
1113	.ENDIF	1113	.ENDIF
1114	.ELSE	1114	.ELSE
1115	.IF "$(USE_SHELL)"!="4nt"	1115	.IF "$(USE_SHELL)"!="4nt"
1116	LDUMP=guw.pl ldump4	1116	LDUMP=$(WRAPCMD) ldump4
1117	LDUMP2=guw.pl ldump4	1117	LDUMP2=$(WRAPCMD) ldump4
1118	.ELSE	1118	.ELSE
1119	LDUMP=ldump4	1119	LDUMP=ldump4
1120	LDUMP2=ldump4	1120	LDUMP2=ldump4
Lines 1156-1169 Link Here
1156	RSC=rscdep	1156	RSC=rscdep
1157	.IF "$(GUI)"=="WNT"	1157	.IF "$(GUI)"=="WNT"
1158	.IF "$(USE_SHELL)"!="4nt"	1158	.IF "$(USE_SHELL)"!="4nt"
1159	RSC=guw.pl rscdep	1159	RSC=$(WRAPCMD) rscdep
1160	.ENDIF	1160	.ENDIF
1161	.ENDIF	1161	.ENDIF
1162	.ELSE	1162	.ELSE
1163	RSC=rsc	1163	RSC=rsc
1164	.IF "$(GUI)"=="WNT"	1164	.IF "$(GUI)"=="WNT"
1165	.IF "$(USE_SHELL)"!="4nt"	1165	.IF "$(USE_SHELL)"!="4nt"
1166	RSC=guw.pl rsc	1166	RSC=$(WRAPCMD) rsc
1167	.ENDIF	1167	.ENDIF
1168	.ENDIF	1168	.ENDIF
1169	.ENDIF	1169	.ENDIF
Lines 1425-1430 Link Here
1425	.IF "$(NO_DEFAULT_STL)"==""	1425	.IF "$(NO_DEFAULT_STL)"==""
1426	STDLIB+=$(LIBSTLPORT)	1426	STDLIB+=$(LIBSTLPORT)
1427	STDSHL+=$(LIBSTLPORT)	1427	STDSHL+=$(LIBSTLPORT)
		1428	.ELSE
		1429	STDLIB+=$(STDLIBCPP)
		1430	STDSHL+=$(STDLIBCPP)
1428	.ENDIF # "$(NO_DEFAULT_STL)"==""	1431	.ENDIF # "$(NO_DEFAULT_STL)"==""
1429		1432
1430	# fill up unresolved symbols not found else where	1433	# fill up unresolved symbols not found else where

Lines 90-127 Link Here

(-)solenv/bin/gum.pl.orig (-15 / +14 lines)
90	# procedures	90	# procedures
91		91
92	#----------------------------------------------------------	92	#----------------------------------------------------------
93	# Function name: WinFormat	93	# Function name: MingWCygwinFormat
94	# Description: Format variables to Windows Format.	94	# Description: Format variables to Windows Format.
95	# Arguments: 1. Variable (string) with one token	95	# Arguments: 1. Variable (string) with one token
96	# Return value: Reformatted String	96	# Return value: Reformatted String
97	#----------------------------------------------------------	97	#----------------------------------------------------------
98	sub WinFormat {	98	sub MingWCygwinFormat {
99	my $variable = shift @_;	99	my $variable = shift @_;
100	my( $d1, $d1_prefix, $d2 );	100	my( $d1, $d1_prefix, $d2 );
101		101
102	$variable =~ s/(\$\w+)/$1/eeg ; # expand the variables	102	$variable =~ s/(\$\w+)/$1/eeg ; # expand the variables
103	$variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice!	103	$variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice!
104	$variable =~ s/:/;/g;	104	$variable =~ s/:/;/g;
105	$variable =~ s/([;]\|\A)(\w);/$1$2:/g; # get back the drives	105	$variable =~ s/([;]\|\A\|\A\s*-\w)(\w);/$1$2:/g; # get back the drives
106	# Search for posix path ;entry; and replace with cygpath -w entry, accept quotes.	106	# Search for posix path ;entry; and replace with cygpath -w entry, accept quotes.
107	while ( $variable =~ /(?:;\|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:;\|\Z)/ ) { # Normal paths	107	while ( $variable =~ /(?:;\|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:;\|\Z)/ ) { # Normal paths
108	if ( defined $debug ) { print(STDERR "WinFormat:\nnormal path:\n$variable\n");};	108	if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nnormal path:\n$variable\n");};
109	$d1 = $1 ;	109	$d1 = $1 ;
110	chomp( $d2 = qx{cygpath -w "$d1"} ) ;	110	chomp( $d2 = qx{cygpath -m "$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\.\- ~]+)+\/?)[\'\"]?\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 -> $2
115	if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");};	115	if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\ninclude path:\n$variable\n");};
116	$d1_prefix = $1;	116	$d1_prefix = $1;
117	$d1 = $2;	117	$d1 = $2;
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 -m "$d1"} );
121	} else {	121	} else {
122	chomp( $d1 = qx{cygpath -w "$d1"} );	122	chomp( $d1 = qx{cygpath -m "$d1"} );
123	}	123	}
124	# "cygpath -d" returns "" if the file doesn't exist.	124	# "cygpath -m" returns "" if the file doesn't exist.
125	if ($d1 eq "") {	125	if ($d1 eq "") {
126	$d1 = ".";	126	$d1 = ".";
127	print(STDERR "Error: guw.pl: Option:$variable:\nhas a problem! Probably nonexistent filename with space.\n");	127	print(STDERR "Error: guw.pl: Option:$variable:\nhas a problem! Probably nonexistent filename with space.\n");
Lines 129-141 Link Here
129	$variable = $d1_prefix.$d1;	129	$variable = $d1_prefix.$d1;
130	}	130	}
131	if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\- ~]+)+)/ ) {	131	if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\- ~]+)+)/ ) {
132	print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");	132	print(STDERR "Error: guw.pl: MingWCygwinFormat: Not converted -X/... type switch in :$variable:.\n");
133	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }	133	if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
134	}	134	}
135	$variable =~ s/\//\\/g; # Remaining \ come from e.g.: ../foo/baa
136	$variable =~ s/^\\$/\//g; # a single "/" needs to be preserved	135	$variable =~ s/^\\$/\//g; # a single "/" needs to be preserved
137		136
138	if ( defined $debug ) { print(STDERR "WinFormat:\nresult:$variable\n");};	137	if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nresult:$variable\n");};
139	return $variable;	138	return $variable;
140	}	139	}
141		140
Lines 183-189 Link Here
183	print(CMD join(' ', @cmd_file));	182	print(CMD join(' ', @cmd_file));
184	close(CMD);	183	close(CMD);
185	# convert '@filename' to dos style	184	# convert '@filename' to dos style
186	$para = WinFormat( $para );	185	$para = MingWCygwinFormat( $para );
187	if ( defined $debug ) { print(STDERR "----------------------------\n");};	186	if ( defined $debug ) { print(STDERR "----------------------------\n");};
188	if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");}	187	if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");}
189	$para = "@".$para;	188	$para = "@".$para;
Lines 205-211 Link Here
205	}	204	}
206	}	205	}
207	if( $is_no_para ) {	206	if( $is_no_para ) {
208	$para = WinFormat($para);	207	$para = MingWCygwinFormat($para);
209	}	208	}
210	if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );};	209	if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );};
211	} # else	210	} # else
Lines 241-247 Link Here
241	if ( defined $this_var )	240	if ( defined $this_var )
242	{	241	{
243	if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );};	242	if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );};
244	$ENV{ $one_var } = WinFormat( $this_var );	243	$ENV{ $one_var } = MingWCygwinFormat( $this_var );
245	if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );};	244	if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );};
246	}	245	}
247	}	246	}