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

(-)source/makefile.mk.orig (-10 / +35 lines)
Lines 139-154 Link Here
139
139
140
APP2TARGET= helpex
140
APP2TARGET= helpex
141
APP2OBJS= $(OBJ)$/helpmerge.obj  $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj $(OBJ)$/hw2fw.obj
141
APP2OBJS= $(OBJ)$/helpmerge.obj  $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj $(OBJ)$/hw2fw.obj
142
APP2STDLIBS=$(BTSTRPLIB) $(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
142
143
.IF "$(OS)"!="MACOSX"
144
APP2STDLIBS+= $(BTSTRPLIB)
145
.ENDIF
146
147
APP2STDLIBS=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
148
149
.IF "$(OS)"=="MACOSX"
150
# static libs at end for OS X
151
APP2STDLIBS+= $(BTSTRPLIB)
152
.ENDIF
143
153
144
# extractor and merger for *.lng and *.lng
154
# extractor and merger for *.lng and *.lng
145
APP3TARGET= ulfex
155
APP3TARGET= ulfex
146
APP3OBJS=   $(OBJ)$/lngmerge.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj
156
APP3OBJS=   $(OBJ)$/lngmerge.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj
157
158
.IF "$(OS)"!="MACOSX"
159
APP3STDLIBS+= $(BTSTRPLIB)
160
.ENDIF
147
APP3STDLIBS+= \
161
APP3STDLIBS+= \
148
            $(BTSTRPLIB) \
149
            $(TOOLSLIB) \
162
            $(TOOLSLIB) \
150
            $(VOSLIB) \
163
            $(VOSLIB) \
151
            $(SALLIB)
164
            $(SALLIB)
165
.IF "$(OS)"=="MACOSX"
166
# static libs at end for OS X
167
APP3STDLIBS+= $(BTSTRPLIB)
168
.ENDIF
152
169
153
# encoding converter for *.gsi
170
# encoding converter for *.gsi
154
APP4TARGET= gsiconv
171
APP4TARGET= gsiconv
Lines 172-200 Link Here
172
APP6TARGET= cfgex
189
APP6TARGET= cfgex
173
APP6OBJS=   $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
190
APP6OBJS=   $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
174
191
175
#.IF "$(OS)"!="MACOSX"
192
.IF "$(OS)"!="MACOSX"
176
#APP6STDLIBS+= $(BTSTRPLIB)
193
APP6STDLIBS+= $(BTSTRPLIB)
177
#.ENDIF
194
.ENDIF
178
195
179
APP6STDLIBS+= \
196
APP6STDLIBS+= \
180
            $(BTSTRPLIB) \
181
            $(TOOLSLIB) \
197
            $(TOOLSLIB) \
182
            $(VOSLIB) \
198
            $(VOSLIB) \
183
            $(SALLIB)
199
            $(SALLIB)
184
200
201
.IF "$(OS)"=="MACOSX"
202
# static libs at end for OS X
203
APP6STDLIBS+= $(BTSTRPLIB)
204
.ENDIF
205
185
# extractor and merger for *.xrm
206
# extractor and merger for *.xrm
186
APP7TARGET= xrmex
207
APP7TARGET= xrmex
187
APP7OBJS=   $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
208
APP7OBJS=   $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
188
209
189
#.IF "$(OS)"!="MACOSX"
210
.IF "$(OS)"!="MACOSX"
190
#APP7STDLIBS+= $(BTSTRPLIB)
211
APP7STDLIBS+= $(BTSTRPLIB)
191
#.ENDIF
212
.ENDIF
192
213
193
APP7STDLIBS+= \
214
APP7STDLIBS+= \
194
            $(BTSTRPLIB) \
195
            $(TOOLSLIB) \
215
            $(TOOLSLIB) \
196
            $(VOSLIB) \
216
            $(VOSLIB) \
197
            $(SALLIB)
217
            $(SALLIB)
218
219
.IF "$(OS)"=="MACOSX"
220
# static libs at end for OS X
221
APP7STDLIBS+= $(BTSTRPLIB)
222
.ENDIF
198
223
199
#APP8TARGET=  sdfupdate
224
#APP8TARGET=  sdfupdate
200
#APP8OBJS= $(OBJ)$/sdfupdate.obj
225
#APP8OBJS= $(OBJ)$/sdfupdate.obj

Return to issue 50458