]> git.saurik.com Git - wxWidgets.git/blame - src/os2/makefile.va
fixed a memory leak and an initialization problem
[wxWidgets.git] / src / os2 / makefile.va
CommitLineData
0e320a79
DW
1#
2# File: makefile.va
3# Author: Dave Webster
4# Created: 1999
5# Updated:
6# Copyright: (c) 1999, Dave Webster
7#
8# "%W% %G%"
9#
10# Makefile : Builds wxWindows library wx.lib for VisualAge C++
11# Arguments:
12#
13# FINAL=1 argument to nmake to build version with no debugging info.
14# dll builds a library (wxdll.lib) suitable for creating DLLs
15#
16!include <..\makeva.env>
17
18THISDIR=$(WXWIN)\src\os2
19
20!if "$(WXMAKINGDLL)" == "1"
21LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
22DUMMYOBJ=$D\dummydll.obj
23!else
24LIBTARGET=$(WXLIB)
9fea1a5d
DW
25COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
26COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
e6ebb514 27COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib
9fea1a5d
DW
28GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
29NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
11e59d47
DW
30OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
31OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
16a12a3d 32HTMLTEMPTGT=$(WXDIR)\lib\wxhtml.lib
0e320a79
DW
33DUMMYOBJ=$D\dummy.obj
34!endif
35
36# Please set these according to the settings in setup.h, so we can include
37# the appropriate libraries in wx.lib
38
39# This one overrides the others, to be consistent with the settings in wx_setup.h
40MINIMAL_WXWINDOWS_SETUP=0
41
42PERIPH_LIBS=
43PERIPH_TARGET=
44PERIPH_CLEAN_TARGET=
45
46# These are absolute paths, so that the compiler
47# generates correct __FILE__ symbols for debugging.
48# Otherwise you don't be able to double-click on a memory
49# error to load that file.
50GENDIR=$(WXDIR)\src\generic
51COMMDIR=$(WXDIR)\src\common
52OS2DIR=$(WXDIR)\src\os2
53HTMLDIR = $(WXDIR)\src\html
54
50c375d3
DW
55!if [md $(COMMDIR)\$D]
56!endif
57
58!if [md $(OS2DIR)\$D]
59!endif
60
61!if [md $(GENDIR)\$D]
62!endif
63
64!if [md $(HTMLDIR)\$D]
65!endif
66
0e320a79
DW
67{..\generic}.cpp{..\generic\$D}.obj:
68 @echo $<
69 icc @<<
70$(CPPFLAGS) /Fo$@ /Tp $<
71<<
72
73{..\common}.cpp{..\common\$D}.obj:
74 @echo $<
75 icc @<<
76$(CPPFLAGS) /Fo$@ /Tp $<
77<<
78
79{..\os2}.cpp{..\os2\$D}.obj:
913df6f2 80 @echo $<
0e320a79
DW
81 icc @<<
82$(CPPFLAGS) /Fo$@ /Tp $<
83<<
84
fb9010ed
DW
85{..\os2}.c{..\os2\$D}.obj:
86 @echo $<
87 icc @<<
88$(CPPFLAGS) /Fo$@ /Tp $<
89<<
90
0e320a79 91{..\html}.cpp{..\html\$D}.obj:
913df6f2 92 @echo $<
0e320a79
DW
93 icc @<<
94$(CPPFLAGS) /Fo$@ /Tp $<
95<<
96
97GENERICOBJS= \
e6ebb514 98 ..\generic\$D\busyinfo.obj \
27e2ed81 99 ..\generic\$D\calctrl.obj \
0616b838 100 ..\generic\$D\caret.obj \
0e320a79 101 ..\generic\$D\choicdgg.obj \
e6ebb514
DW
102 ..\generic\$D\colrdlgg.obj \
103 ..\generic\$D\dcpsg.obj \
6f38c86f 104 ..\generic\$D\dirctrlg.obj \
426d5745
DW
105 ..\generic\$D\dragimgg.obj \
106 ..\generic\$D\fontdlgg.obj \
8d7ddd02 107 ..\generic\$D\fdrepdlg.obj \
e6ebb514 108 ..\generic\$D\grid.obj \
1ec46a5b 109 ..\generic\$D\gridctrl.obj \
426d5745 110 ..\generic\$D\gridsel.obj \
e6ebb514
DW
111 ..\generic\$D\helpext.obj \
112 ..\generic\$D\helphtml.obj \
113 ..\generic\$D\helpwxht.obj \
114 ..\generic\$D\helpxlp.obj \
115 ..\generic\$D\imaglist.obj \
0e320a79 116 ..\generic\$D\laywin.obj \
e6ebb514
DW
117 ..\generic\$D\listctrl.obj \
118 ..\generic\$D\logg.obj \
119 ..\generic\$D\numdlgg.obj \
0e320a79 120 ..\generic\$D\panelg.obj \
e6ebb514
DW
121 ..\generic\$D\printps.obj \
122 ..\generic\$D\prntdlgg.obj \
0e320a79
DW
123 ..\generic\$D\progdlgg.obj \
124 ..\generic\$D\prop.obj \
125 ..\generic\$D\propform.obj \
126 ..\generic\$D\proplist.obj \
127 ..\generic\$D\sashwin.obj \
0367c1c0
DW
128 ..\generic\$D\scrlwing.obj \
129 ..\generic\$D\spinctlg.obj \
0e320a79
DW
130 ..\generic\$D\splitter.obj \
131 ..\generic\$D\statusbr.obj \
132 ..\generic\$D\tabg.obj \
426d5745 133 ..\generic\$D\tbarsmpl.obj \
0e320a79 134 ..\generic\$D\textdlgg.obj \
16a12a3d 135 ..\generic\$D\tipdlg.obj \
5b3ed311 136 ..\generic\$D\tipwin.obj \
760ac9ab 137 ..\generic\$D\treectlg.obj \
426d5745
DW
138 ..\generic\$D\treelay.obj \
139 ..\generic\$D\wizard.obj
0e320a79 140
004fd0c8 141# ..\generic\$D\gridg.obj \
0e320a79
DW
142# ..\generic\$D\notebook.obj \
143
9fea1a5d 144GENLIBOBJS= \
e6ebb514 145 busyinfo.obj \
27e2ed81 146 calctrl.obj \
0616b838 147 caret.obj \
9fea1a5d 148 choicdgg.obj \
e6ebb514
DW
149 colrdlgg.obj \
150 dcpsg.obj \
6f38c86f 151 dirctrlg.obj \
426d5745
DW
152 dragimgg.obj \
153 fontdlgg.obj \
8d7ddd02 154 fdrepdlg.obj \
e6ebb514 155 grid.obj \
1ec46a5b 156 gridctrl.obj \
426d5745 157 gridsel.obj \
e6ebb514
DW
158 helpext.obj \
159 helphtml.obj \
160 helpwxht.obj \
161 helpxlp.obj \
162 imaglist.obj \
9fea1a5d 163 laywin.obj \
e6ebb514
DW
164 listctrl.obj \
165 logg.obj \
166 numdlgg.obj \
9fea1a5d 167 panelg.obj \
e6ebb514
DW
168 printps.obj \
169 prntdlgg.obj \
9fea1a5d
DW
170 progdlgg.obj \
171 prop.obj \
172 propform.obj \
173 proplist.obj \
174 sashwin.obj \
0367c1c0
DW
175 scrlwing.obj \
176 spinctlg.obj \
9fea1a5d
DW
177 splitter.obj \
178 statusbr.obj \
179 tabg.obj \
426d5745 180 tbarsmpl.obj \
9fea1a5d 181 textdlgg.obj \
16a12a3d 182 tipdlg.obj \
5b3ed311 183 tipwin.obj \
760ac9ab 184 treectlg.obj \
426d5745
DW
185 treelay.obj \
186 wizard.obj
9fea1a5d 187
1408104d 188# These are generic things that don't need to be compiled on PM,
0e320a79
DW
189# but sometimes it's useful to do so for testing purposes.
190NONESSENTIALOBJS= \
426d5745 191 ..\generic\$D\msgdlgg.obj
0e320a79
DW
192
193COMMONOBJS = \
1be7f92a
DW
194 ..\common\$D\appcmn.obj \
195 ..\common\$D\choiccmn.obj \
dcd307ee 196 ..\common\$D\clipcmn.obj \
2d021175 197 ..\common\$D\clntdata.obj \
426d5745 198 ..\common\$D\cmdline.obj \
0e320a79 199 ..\common\$D\cmndata.obj \
0367c1c0 200 ..\common\$D\cmdproc.obj \
0e320a79 201 ..\common\$D\config.obj \
1bcfc0e1 202 ..\common\$D\containr.obj \
5b3ed311 203 ..\common\$D\cshelp.obj \
1be7f92a 204 ..\common\$D\ctrlcmn.obj \
dcd307ee 205 ..\common\$D\ctrlsub.obj \
610a6ee9 206 ..\common\$D\datetime.obj \
2e1a688e 207 ..\common\$D\datstrm.obj \
426d5745
DW
208!if "$(WXMAKINGDLL)" != "1"
209# don't have an ODBC database
0e320a79 210 ..\common\$D\db.obj \
254ccb8c 211 ..\common\$D\dbgrid.obj \
0e320a79 212 ..\common\$D\dbtable.obj \
426d5745 213!endif
2e1a688e 214 ..\common\$D\dcbase.obj \
29d83fc1 215 ..\common\$D\dircmn.obj \
1be7f92a 216 ..\common\$D\dlgcmn.obj \
426d5745 217 ..\common\$D\dndcmn.obj \
2e1a688e 218 ..\common\$D\dobjcmn.obj \
1be7f92a 219 ..\common\$D\docmdi.obj \
0e320a79 220 ..\common\$D\docview.obj \
0e320a79
DW
221 ..\common\$D\dynarray.obj \
222 ..\common\$D\dynlib.obj \
6f38c86f 223 ..\common\$D\effects.obj \
aa2097dd 224 ..\common\$D\encconv.obj \
0e320a79 225 ..\common\$D\event.obj \
1be7f92a 226 ..\common\$D\extended.obj \
8d7ddd02 227 ..\common\$D\fddlgcmn.obj \
1be7f92a 228 ..\common\$D\ffile.obj \
0e320a79 229 ..\common\$D\file.obj \
0e320a79 230 ..\common\$D\fileconf.obj \
1be7f92a 231 ..\common\$D\filefn.obj \
d4714748 232 ..\common\$D\filename.obj \
1be7f92a
DW
233 ..\common\$D\filesys.obj \
234 ..\common\$D\fontcmn.obj \
aa2097dd 235 ..\common\$D\fontmap.obj \
0e320a79 236 ..\common\$D\framecmn.obj \
1be7f92a 237 ..\common\$D\fs_inet.obj \
426d5745 238 ..\common\$D\fs_mem.obj \
1be7f92a 239 ..\common\$D\fs_zip.obj \
0e320a79 240 ..\common\$D\ftp.obj \
0367c1c0 241 ..\common\$D\gaugecmn.obj \
0e320a79 242 ..\common\$D\gdicmn.obj \
426d5745 243 ..\common\$D\geometry.obj \
1be7f92a
DW
244 ..\common\$D\gifdecod.obj \
245 ..\common\$D\hash.obj \
246 ..\common\$D\helpbase.obj \
247 ..\common\$D\http.obj \
248 ..\common\$D\imagall.obj \
0e320a79 249 ..\common\$D\imagbmp.obj \
1be7f92a
DW
250 ..\common\$D\image.obj \
251 ..\common\$D\imaggif.obj \
0e320a79 252 ..\common\$D\imagjpeg.obj \
1be7f92a 253 ..\common\$D\imagpcx.obj \
0e320a79 254 ..\common\$D\imagpng.obj \
1be7f92a 255 ..\common\$D\imagpnm.obj \
426d5745 256 ..\common\$D\imagtiff.obj \
5fd2b2c6 257 ..\common\$D\imagxpm.obj \
0e320a79
DW
258 ..\common\$D\intl.obj \
259 ..\common\$D\ipcbase.obj \
0e320a79 260 ..\common\$D\layout.obj \
dcd307ee 261 ..\common\$D\lboxcmn.obj \
1be7f92a 262 ..\common\$D\list.obj \
0e320a79 263 ..\common\$D\log.obj \
1be7f92a
DW
264 ..\common\$D\longlong.obj \
265 ..\common\$D\matrix.obj \
0e320a79 266 ..\common\$D\memory.obj \
476607a7 267 ..\common\$D\menucmn.obj \
1cd04aa2 268 ..\common\$D\mimecmn.obj \
0e320a79 269 ..\common\$D\module.obj \
1be7f92a 270 ..\common\$D\mstream.obj \
0367c1c0 271 ..\common\$D\nbkbase.obj \
0e320a79 272 ..\common\$D\object.obj \
1be7f92a 273 ..\common\$D\objstrm.obj \
426d5745
DW
274!if "$(WXMAKINGDLL)" != "1"
275# don't have an ODBC database
276 ..\common\$D\odbc.obj \
277!endif
1be7f92a 278 ..\common\$D\paper.obj \
0367c1c0 279 ..\common\$D\popupcmn.obj \
0e320a79 280 ..\common\$D\prntbase.obj \
1be7f92a
DW
281 ..\common\$D\process.obj \
282 ..\common\$D\protocol.obj \
1a2bf4eb 283 ..\common\$D\quantize.obj \
0367c1c0 284 ..\common\$D\radiocmn.obj \
834999c2 285 ..\common\$D\regex.obj \
0e320a79 286 ..\common\$D\resource.obj \
1be7f92a
DW
287 ..\common\$D\sckaddr.obj \
288 ..\common\$D\sckfile.obj \
289 ..\common\$D\sckipc.obj \
290 ..\common\$D\sckstrm.obj \
291 ..\common\$D\serbase.obj \
292 ..\common\$D\sizer.obj \
293 ..\common\$D\socket.obj \
987da0d4 294 ..\common\$D\statbar.obj \
1be7f92a
DW
295 ..\common\$D\strconv.obj \
296 ..\common\$D\stream.obj \
297 ..\common\$D\string.obj \
893758d5 298 ..\common\$D\sysopt.obj \
0e320a79 299 ..\common\$D\tbarbase.obj \
0cf6acbf 300 ..\common\$D\textbuf.obj \
1be7f92a
DW
301 ..\common\$D\textcmn.obj \
302 ..\common\$D\textfile.obj \
0e320a79 303 ..\common\$D\timercmn.obj \
1be7f92a 304 ..\common\$D\tokenzr.obj \
9e914011 305 ..\common\$D\toplvcmn.obj \
1a2bf4eb 306 ..\common\$D\treebase.obj \
1be7f92a
DW
307 ..\common\$D\txtstrm.obj \
308 ..\common\$D\unzip.obj \
309 ..\common\$D\url.obj \
0e320a79 310 ..\common\$D\utilscmn.obj \
0e320a79 311 ..\common\$D\valgen.obj \
1be7f92a 312 ..\common\$D\validate.obj \
0e320a79 313 ..\common\$D\valtext.obj \
0e320a79 314 ..\common\$D\variant.obj \
1be7f92a 315 ..\common\$D\wfstream.obj \
0e320a79 316 ..\common\$D\wincmn.obj \
0e320a79 317 ..\common\$D\wxchar.obj \
1be7f92a 318 ..\common\$D\wxexpr.obj \
a51fb642 319 ..\common\$D\xpmdecod.obj \
1be7f92a
DW
320 ..\common\$D\y_tab.obj \
321 ..\common\$D\zipstrm.obj \
322 ..\common\$D\zstream.obj
0e320a79 323
9fea1a5d 324COMLIBOBJS1 = \
1be7f92a
DW
325 appcmn.obj \
326 choiccmn.obj \
dcd307ee 327 clipcmn.obj \
2d021175 328 clntdata.obj \
426d5745 329 cmdline.obj \
9fea1a5d 330 cmndata.obj \
0367c1c0 331 cmdproc.obj \
9fea1a5d 332 config.obj \
1bcfc0e1 333 containr.obj \
5b3ed311 334 cshelp.obj \
1be7f92a 335 ctrlcmn.obj \
dcd307ee 336 ctrlsub.obj \
610a6ee9 337 datetime.obj \
2e1a688e 338 datstrm.obj \
9fea1a5d 339 db.obj \
254ccb8c 340 dbgrid.obj \
9fea1a5d 341 dbtable.obj \
2e1a688e 342 dcbase.obj \
29d83fc1 343 dircmn.obj \
426d5745 344 dndcmn.obj \
1be7f92a 345 dlgcmn.obj \
2e1a688e 346 dobjcmn.obj \
1be7f92a 347 docmdi.obj \
9fea1a5d 348 docview.obj \
9fea1a5d
DW
349 dynarray.obj \
350 dynlib.obj \
6f38c86f 351 effects.obj \
aa2097dd 352 encconv.obj \
9fea1a5d 353 event.obj \
1be7f92a 354 extended.obj \
8d7ddd02 355 fddlgcmn.obj \
1be7f92a 356 ffile.obj \
9fea1a5d 357 file.obj \
9fea1a5d 358 fileconf.obj \
1be7f92a 359 filefn.obj \
d4714748 360 filename.obj \
1be7f92a
DW
361 filesys.obj \
362 fontcmn.obj \
aa2097dd 363 fontmap.obj \
9fea1a5d 364 framecmn.obj \
1be7f92a 365 fs_inet.obj \
426d5745 366 fs_mem.obj \
2d021175 367 fs_zip.obj
426d5745
DW
368
369COMLIBOBJS2 = \
2d021175 370 ftp.obj \
1bcfc0e1 371 gaugecmn.obj \
8d7ddd02
DW
372 gdicmn.obj \
373 geometry.obj \
0367c1c0
DW
374 gifdecod.obj \
375 hash.obj \
254ccb8c 376 helpbase.obj \
29d83fc1 377 http.obj \
6f38c86f 378 imagall.obj \
d4714748 379 imagbmp.obj \
5b3ed311 380 image.obj \
1be7f92a 381 imaggif.obj \
9fea1a5d 382 imagjpeg.obj \
1be7f92a 383 imagpcx.obj \
426d5745 384 imagpng.obj \
aa2097dd 385 imagpnm.obj \
426d5745 386 imagtiff.obj \
5fd2b2c6 387 imagxpm.obj \
aa2097dd 388 intl.obj \
9fea1a5d 389 ipcbase.obj \
2e1a688e 390 layout.obj \
dcd307ee 391 lboxcmn.obj \
2e1a688e 392 list.obj \
e6ebb514 393 log.obj \
1be7f92a
DW
394 longlong.obj \
395 matrix.obj \
9fea1a5d 396 memory.obj \
476607a7 397 menucmn.obj \
1cd04aa2 398 mimecmn.obj \
9fea1a5d 399 module.obj \
1be7f92a 400 mstream.obj \
0367c1c0 401 nbkbase.obj \
9fea1a5d 402 object.obj \
1be7f92a 403 objstrm.obj \
426d5745 404 odbc.obj \
1be7f92a 405 paper.obj \
0367c1c0 406 popupcmn.obj \
9fea1a5d 407 prntbase.obj \
1be7f92a
DW
408 process.obj \
409 protocol.obj \
1a2bf4eb 410 quantize.obj \
2d021175 411 radiocmn.obj
0367c1c0
DW
412
413COMLIBOBJS3 = \
2d021175 414 regex.obj \
1bcfc0e1 415 resource.obj \
8d7ddd02
DW
416 sckaddr.obj \
417 sckfile.obj \
834999c2 418 sckipc.obj \
1be7f92a
DW
419 sckstrm.obj \
420 serbase.obj \
421 sizer.obj \
422 socket.obj \
987da0d4 423 statbar.obj \
0367c1c0 424 strconv.obj \
254ccb8c 425 stream.obj \
29d83fc1 426 string.obj \
893758d5 427 sysopt.obj \
5fd2b2c6 428 tbarbase.obj \
0cf6acbf 429 textbuf.obj \
6f38c86f 430 textcmn.obj \
d4714748 431 textfile.obj \
5b3ed311 432 timercmn.obj \
1a2bf4eb 433 tokenzr.obj \
9e914011 434 toplvcmn.obj \
1a2bf4eb 435 treebase.obj \
1be7f92a
DW
436 txtstrm.obj \
437 unzip.obj \
438 url.obj \
9fea1a5d 439 utilscmn.obj \
9fea1a5d 440 valgen.obj \
426d5745 441 validate.obj \
aa2097dd
DW
442 valtext.obj \
443 variant.obj \
1be7f92a 444 wfstream.obj \
9fea1a5d 445 wincmn.obj \
9fea1a5d 446 wxchar.obj \
1be7f92a 447 wxexpr.obj \
a51fb642 448 xpmdecod.obj \
1be7f92a
DW
449 y_tab.obj \
450 zipstrm.obj \
2e1a688e 451 zstream.obj
0e320a79
DW
452
453OS2OBJS = \
77cd51c3
DW
454 ..\os2\$D\accel.obj \
455 ..\os2\$D\app.obj \
456 ..\os2\$D\bitmap.obj \
457 ..\os2\$D\bmpbuttn.obj \
458 ..\os2\$D\brush.obj \
459 ..\os2\$D\button.obj \
0616b838
DW
460 ..\os2\$D\checkbox.obj \
461 ..\os2\$D\checklst.obj \
462 ..\os2\$D\choice.obj \
463 ..\os2\$D\clipbrd.obj \
45fcbf3b
DW
464 ..\os2\$D\colour.obj \
465 ..\os2\$D\combobox.obj \
466 ..\os2\$D\control.obj \
4486e1be 467 ..\os2\$D\cursor.obj \
23e4b7d8 468 ..\os2\$D\data.obj \
6dddc146 469 ..\os2\$D\dataobj.obj \
c3d43472 470 ..\os2\$D\dc.obj \
ce44c50e
DW
471 ..\os2\$D\dcclient.obj \
472 ..\os2\$D\dcmemory.obj \
473 ..\os2\$D\dcprint.obj \
474 ..\os2\$D\dcscreen.obj \
c3d43472 475 ..\os2\$D\dialog.obj \
6f38c86f 476 ..\os2\$D\dir.obj \
27476f73 477 ..\os2\$D\dirdlg.obj \
f0a56ab0
DW
478 ..\os2\$D\dnd.obj \
479 ..\os2\$D\filedlg.obj \
21802234
DW
480 ..\os2\$D\font.obj \
481 ..\os2\$D\fontdlg.obj \
aa2097dd
DW
482 ..\os2\$D\fontenum.obj \
483 ..\os2\$D\fontutil.obj \
c3d43472 484 ..\os2\$D\frame.obj \
0371a691 485 ..\os2\$D\gauge.obj \
97507cce 486 ..\os2\$D\gdiimage.obj \
6f38c86f 487 ..\os2\$D\gdiobj.obj \
fb9010ed 488 ..\os2\$D\gsocket.obj \
29d83fc1 489 ..\os2\$D\gsockpm.obj \
fb9010ed
DW
490 ..\os2\$D\helpwin.obj \
491 ..\os2\$D\icon.obj \
fb9010ed
DW
492 ..\os2\$D\iniconf.obj \
493 ..\os2\$D\joystick.obj \
494 ..\os2\$D\listbox.obj \
75f11ad7
DW
495 ..\os2\$D\main.obj \
496 ..\os2\$D\mdi.obj \
497 ..\os2\$D\menu.obj \
498 ..\os2\$D\menuitem.obj \
499 ..\os2\$D\metafile.obj \
1cd04aa2 500 ..\os2\$D\mimetype.obj \
75f11ad7 501 ..\os2\$D\minifram.obj \
cdf1e714
DW
502 ..\os2\$D\msgdlg.obj \
503 ..\os2\$D\nativdlg.obj \
504 ..\os2\$D\notebook.obj \
505 ..\os2\$D\ownerdrw.obj \
506 ..\os2\$D\palette.obj \
507 ..\os2\$D\pen.obj \
fb46a9a6 508 ..\os2\$D\pnghand.obj \
cdf1e714
DW
509 ..\os2\$D\print.obj \
510 ..\os2\$D\radiobox.obj \
511 ..\os2\$D\radiobut.obj \
409c9842
DW
512 ..\os2\$D\region.obj \
513 ..\os2\$D\scrolbar.obj \
514 ..\os2\$D\settings.obj \
515 ..\os2\$D\slider.obj \
516 ..\os2\$D\spinbutt.obj \
517 ..\os2\$D\spinctrl.obj \
518 ..\os2\$D\statbmp.obj \
519 ..\os2\$D\statbox.obj \
e6ebb514 520 ..\os2\$D\statline.obj \
d90895ac 521 ..\os2\$D\stattext.obj \
d90895ac
DW
522 ..\os2\$D\tabctrl.obj \
523 ..\os2\$D\taskbar.obj \
524 ..\os2\$D\textctrl.obj \
525 ..\os2\$D\thread.obj \
526 ..\os2\$D\timer.obj \
527 ..\os2\$D\toolbar.obj \
528 ..\os2\$D\tooltip.obj \
d90895ac
DW
529 ..\os2\$D\utils.obj \
530 ..\os2\$D\utilsexc.obj \
531 ..\os2\$D\wave.obj \
d4714748
DW
532 ..\os2\$D\window.obj \
533 ..\os2\$D\xpmhand.obj
77cd51c3 534
11e59d47 535OS2LIBOBJS1 = \
77cd51c3
DW
536 accel.obj \
537 app.obj \
538 bitmap.obj \
539 bmpbuttn.obj \
540 brush.obj \
541 button.obj \
0616b838
DW
542 checkbox.obj \
543 checklst.obj \
544 choice.obj \
545 clipbrd.obj \
45fcbf3b
DW
546 colour.obj \
547 combobox.obj \
548 control.obj \
4486e1be 549 cursor.obj \
23e4b7d8 550 data.obj \
6dddc146 551 dataobj.obj \
77cd51c3 552 dc.obj \
ce44c50e
DW
553 dcclient.obj \
554 dcmemory.obj \
555 dcprint.obj \
556 dcscreen.obj \
77cd51c3 557 dialog.obj \
6f38c86f 558 dir.obj \
27476f73 559 dirdlg.obj \
f0a56ab0
DW
560 dnd.obj \
561 filedlg.obj \
21802234
DW
562 font.obj \
563 fontdlg.obj \
aa2097dd
DW
564 fontenum.obj \
565 fontutil.obj \
77cd51c3 566 frame.obj \
0371a691 567 gauge.obj \
97507cce 568 gdiimage.obj \
0371a691 569 gdiobj.obj \
fb9010ed 570 gsocket.obj \
29d83fc1 571 gsockpm.obj \
fb9010ed
DW
572 helpwin.obj \
573 icon.obj \
fb9010ed
DW
574 iniconf.obj \
575 joystick.obj \
576 listbox.obj \
75f11ad7
DW
577 main.obj \
578 mdi.obj \
579 menu.obj \
29d83fc1 580 menuitem.obj
11e59d47
DW
581
582OS2LIBOBJS2 = \
29d83fc1 583 metafile.obj \
6f38c86f 584 mimetype.obj \
1cd04aa2 585 minifram.obj \
aa2097dd
DW
586 msgdlg.obj \
587 nativdlg.obj \
97507cce 588 notebook.obj \
cdf1e714
DW
589 ownerdrw.obj \
590 palette.obj \
591 pen.obj \
fb46a9a6 592 pnghand.obj \
cdf1e714
DW
593 print.obj \
594 radiobox.obj \
595 radiobut.obj \
409c9842
DW
596 region.obj \
597 scrolbar.obj \
598 settings.obj \
599 slider.obj \
600 spinbutt.obj \
601 spinctrl.obj \
602 statbmp.obj \
603 statbox.obj \
d90895ac 604 stattext.obj \
e6ebb514 605 statline.obj \
d90895ac
DW
606 tabctrl.obj \
607 taskbar.obj \
608 textctrl.obj \
609 thread.obj \
610 timer.obj \
16a12a3d 611 toolbar.obj \
d90895ac 612 tooltip.obj \
d90895ac
DW
613 utils.obj \
614 utilsexc.obj \
615 wave.obj \
d4714748
DW
616 window.obj \
617 xpmhand.obj
0e320a79
DW
618
619HTMLOBJS = \
f38374d0 620 ..\html\$D\helpctrl.obj \
16a12a3d
DW
621 ..\html\$D\helpdata.obj \
622 ..\html\$D\helpfrm.obj \
0e320a79 623 ..\html\$D\htmlcell.obj \
16a12a3d
DW
624 ..\html\$D\htmlfilt.obj \
625 ..\html\$D\htmlpars.obj \
0e320a79
DW
626 ..\html\$D\htmltag.obj \
627 ..\html\$D\htmlwin.obj \
16a12a3d 628 ..\html\$D\htmprint.obj \
426d5745 629 ..\html\$D\m_dflist.obj \
16a12a3d
DW
630 ..\html\$D\m_fonts.obj \
631 ..\html\$D\m_hline.obj \
632 ..\html\$D\m_image.obj \
633 ..\html\$D\m_layout.obj \
634 ..\html\$D\m_links.obj \
635 ..\html\$D\m_list.obj \
426d5745 636 ..\html\$D\m_meta.obj \
16a12a3d
DW
637 ..\html\$D\m_pre.obj \
638 ..\html\$D\m_tables.obj \
16a12a3d
DW
639 ..\html\$D\winpars.obj
640
641HTMLLIBOBJS = \
f38374d0 642 helpctrl.obj \
16a12a3d
DW
643 helpdata.obj \
644 helpfrm.obj \
645 htmlcell.obj \
646 htmlfilt.obj \
647 htmlpars.obj \
648 htmltag.obj \
649 htmlwin.obj \
650 htmprint.obj \
426d5745 651 m_dflist.obj \
16a12a3d
DW
652 m_fonts.obj \
653 m_hline.obj \
654 m_image.obj \
655 m_layout.obj \
656 m_links.obj \
657 m_list.obj \
426d5745 658 m_meta.obj \
16a12a3d
DW
659 m_pre.obj \
660 m_tables.obj \
16a12a3d 661 winpars.obj
0e320a79
DW
662
663# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
16a12a3d 664OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
0e320a79
DW
665
666# Normal, static library
2d021175 667all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
0e320a79
DW
668
669dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
670
671
672test: $(OS2DIR)\$D\wave.obj
673test2: ..\common\Debug\config.obj
674
2d021175
DW
675# If taking wxWindows from CVS, setup.h doesn't exist yet.
676$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
677 copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
678
679$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h
680 copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h
681
1cd04aa2
DW
682$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
683 icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
684
685$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
426d5745 686 icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
1cd04aa2 687
9fea1a5d 688$(COMLIBOBJS1):
1be7f92a
DW
689 copy ..\common\$D\appcmn.obj
690 copy ..\common\$D\choiccmn.obj
dcd307ee 691 copy ..\common\$D\clipcmn.obj
2d021175 692 copy ..\common\$D\clntdata.obj
426d5745 693 copy ..\common\$D\cmdline.obj
9fea1a5d 694 copy ..\common\$D\cmndata.obj
0367c1c0 695 copy ..\common\$D\cmdproc.obj
9fea1a5d 696 copy ..\common\$D\config.obj
1bcfc0e1 697 copy ..\common\$D\containr.obj
5b3ed311 698 copy ..\common\$D\cshelp.obj
1be7f92a 699 copy ..\common\$D\ctrlcmn.obj
e6ebb514 700 copy ..\common\$D\ctrlsub.obj
610a6ee9 701 copy ..\common\$D\datetime.obj
2e1a688e 702 copy ..\common\$D\datstrm.obj
9fea1a5d 703 copy ..\common\$D\db.obj
254ccb8c 704 copy ..\common\$D\dbgrid.obj
9fea1a5d 705 copy ..\common\$D\dbtable.obj
2e1a688e 706 copy ..\common\$D\dcbase.obj
1be7f92a 707 copy ..\common\$D\dlgcmn.obj
29d83fc1 708 copy ..\common\$D\dircmn.obj
426d5745 709 copy ..\common\$D\dndcmn.obj
2e1a688e 710 copy ..\common\$D\dobjcmn.obj
1be7f92a 711 copy ..\common\$D\docmdi.obj
9fea1a5d 712 copy ..\common\$D\docview.obj
9fea1a5d
DW
713 copy ..\common\$D\dynarray.obj
714 copy ..\common\$D\dynlib.obj
6f38c86f 715 copy ..\common\$D\effects.obj
aa2097dd 716 copy ..\common\$D\encconv.obj
9fea1a5d 717 copy ..\common\$D\event.obj
1be7f92a 718 copy ..\common\$D\extended.obj
8d7ddd02 719 copy ..\common\$D\fddlgcmn.obj
1be7f92a 720 copy ..\common\$D\ffile.obj
9fea1a5d 721 copy ..\common\$D\file.obj
9fea1a5d 722 copy ..\common\$D\fileconf.obj
1be7f92a 723 copy ..\common\$D\filefn.obj
d4714748 724 copy ..\common\$D\filename.obj
1be7f92a
DW
725 copy ..\common\$D\filesys.obj
726 copy ..\common\$D\fontcmn.obj
aa2097dd 727 copy ..\common\$D\fontmap.obj
9fea1a5d 728 copy ..\common\$D\framecmn.obj
1be7f92a 729 copy ..\common\$D\fs_inet.obj
426d5745 730 copy ..\common\$D\fs_mem.obj
1be7f92a 731 copy ..\common\$D\fs_zip.obj
426d5745
DW
732
733$(COMLIBOBJS2):
2d021175 734 copy ..\common\$D\ftp.obj
1bcfc0e1 735 copy ..\common\$D\gaugecmn.obj
8d7ddd02
DW
736 copy ..\common\$D\gdicmn.obj
737 copy ..\common\$D\geometry.obj
0367c1c0
DW
738 copy ..\common\$D\gifdecod.obj
739 copy ..\common\$D\hash.obj
254ccb8c 740 copy ..\common\$D\helpbase.obj
29d83fc1 741 copy ..\common\$D\http.obj
6f38c86f 742 copy ..\common\$D\imagall.obj
d4714748 743 copy ..\common\$D\imagbmp.obj
5b3ed311 744 copy ..\common\$D\image.obj
1be7f92a 745 copy ..\common\$D\imaggif.obj
9fea1a5d 746 copy ..\common\$D\imagjpeg.obj
1be7f92a 747 copy ..\common\$D\imagpcx.obj
9fea1a5d 748 copy ..\common\$D\imagpng.obj
aa2097dd 749 copy ..\common\$D\imagpnm.obj
426d5745 750 copy ..\common\$D\imagtiff.obj
5fd2b2c6 751 copy ..\common\$D\imagxpm.obj
aa2097dd 752 copy ..\common\$D\intl.obj
9fea1a5d 753 copy ..\common\$D\ipcbase.obj
9fea1a5d 754 copy ..\common\$D\layout.obj
dcd307ee 755 copy ..\common\$D\lboxcmn.obj
1be7f92a 756 copy ..\common\$D\list.obj
9fea1a5d 757 copy ..\common\$D\log.obj
e6ebb514
DW
758 copy ..\common\$D\longlong.obj
759 copy ..\common\$D\matrix.obj
760 copy ..\common\$D\memory.obj
476607a7 761 copy ..\common\$D\menucmn.obj
1cd04aa2 762 copy ..\common\$D\mimecmn.obj
e6ebb514
DW
763 copy ..\common\$D\module.obj
764 copy ..\common\$D\mstream.obj
0367c1c0 765 copy ..\common\$D\nbkbase.obj
e6ebb514
DW
766 copy ..\common\$D\object.obj
767 copy ..\common\$D\objstrm.obj
426d5745 768 copy ..\common\$D\odbc.obj
e6ebb514 769 copy ..\common\$D\paper.obj
0367c1c0 770 copy ..\common\$D\popupcmn.obj
e6ebb514
DW
771 copy ..\common\$D\prntbase.obj
772 copy ..\common\$D\process.obj
773 copy ..\common\$D\protocol.obj
1a2bf4eb 774 copy ..\common\$D\quantize.obj
0367c1c0 775 copy ..\common\$D\radiocmn.obj
0367c1c0
DW
776
777$(COMLIBOBJS3):
2d021175 778 copy ..\common\$D\regex.obj
1bcfc0e1 779 copy ..\common\$D\resource.obj
8d7ddd02
DW
780 copy ..\common\$D\sckaddr.obj
781 copy ..\common\$D\sckfile.obj
834999c2 782 copy ..\common\$D\sckipc.obj
e6ebb514
DW
783 copy ..\common\$D\sckstrm.obj
784 copy ..\common\$D\serbase.obj
785 copy ..\common\$D\sizer.obj
786 copy ..\common\$D\socket.obj
987da0d4 787 copy ..\common\$D\statbar.obj
e6ebb514 788 copy ..\common\$D\strconv.obj
254ccb8c 789 copy ..\common\$D\stream.obj
29d83fc1 790 copy ..\common\$D\string.obj
893758d5 791 copy ..\common\$D\sysopt.obj
5fd2b2c6 792 copy ..\common\$D\tbarbase.obj
0cf6acbf 793 copy ..\common\$D\textbuf.obj
6f38c86f 794 copy ..\common\$D\textcmn.obj
d4714748 795 copy ..\common\$D\textfile.obj
5b3ed311 796 copy ..\common\$D\timercmn.obj
1a2bf4eb 797 copy ..\common\$D\tokenzr.obj
9e914011 798 copy ..\common\$D\toplvcmn.obj
1a2bf4eb 799 copy ..\common\$D\treebase.obj
e6ebb514
DW
800 copy ..\common\$D\txtstrm.obj
801 copy ..\common\$D\unzip.obj
802 copy ..\common\$D\url.obj
803 copy ..\common\$D\utilscmn.obj
804 copy ..\common\$D\valgen.obj
805 copy ..\common\$D\validate.obj
aa2097dd
DW
806 copy ..\common\$D\valtext.obj
807 copy ..\common\$D\variant.obj
e6ebb514
DW
808 copy ..\common\$D\wfstream.obj
809 copy ..\common\$D\wincmn.obj
810 copy ..\common\$D\wxchar.obj
811 copy ..\common\$D\wxexpr.obj
a51fb642 812 copy ..\common\$D\xpmdecod.obj
e6ebb514
DW
813 copy ..\common\$D\y_tab.obj
814 copy ..\common\$D\zipstrm.obj
1be7f92a 815 copy ..\common\$D\zstream.obj
9fea1a5d
DW
816
817$(GENLIBOBJS):
e6ebb514 818 copy ..\generic\$D\busyinfo.obj
27e2ed81 819 copy ..\generic\$D\calctrl.obj
0616b838 820 copy ..\generic\$D\caret.obj
9fea1a5d 821 copy ..\generic\$D\choicdgg.obj
e6ebb514 822 copy ..\generic\$D\colrdlgg.obj
426d5745 823 copy ..\generic\$D\dragimgg.obj
e6ebb514 824 copy ..\generic\$D\dcpsg.obj
6f38c86f 825 copy ..\generic\$D\dirctrlg.obj
426d5745 826 copy ..\generic\$D\fontdlgg.obj
8d7ddd02 827 copy ..\generic\$D\fdrepdlg.obj
e6ebb514 828 copy ..\generic\$D\grid.obj
1ec46a5b 829 copy ..\generic\$D\gridctrl.obj
426d5745 830 copy ..\generic\$D\gridsel.obj
e6ebb514
DW
831 copy ..\generic\$D\helpext.obj
832 copy ..\generic\$D\helphtml.obj
833 copy ..\generic\$D\helpwxht.obj
834 copy ..\generic\$D\helpxlp.obj
835 copy ..\generic\$D\imaglist.obj
9fea1a5d 836 copy ..\generic\$D\laywin.obj
e6ebb514
DW
837 copy ..\generic\$D\listctrl.obj
838 copy ..\generic\$D\logg.obj
839 copy ..\generic\$D\numdlgg.obj
9fea1a5d 840 copy ..\generic\$D\panelg.obj
e6ebb514
DW
841 copy ..\generic\$D\printps.obj
842 copy ..\generic\$D\prntdlgg.obj
9fea1a5d
DW
843 copy ..\generic\$D\progdlgg.obj
844 copy ..\generic\$D\prop.obj
845 copy ..\generic\$D\propform.obj
846 copy ..\generic\$D\proplist.obj
847 copy ..\generic\$D\sashwin.obj
0367c1c0
DW
848 copy ..\generic\$D\scrlwing.obj
849 copy ..\generic\$D\spinctlg.obj
9fea1a5d
DW
850 copy ..\generic\$D\splitter.obj
851 copy ..\generic\$D\statusbr.obj
852 copy ..\generic\$D\tabg.obj
426d5745 853 copy ..\generic\$D\tbarsmpl.obj
9fea1a5d
DW
854 copy ..\generic\$D\textdlgg.obj
855 copy ..\generic\$D\tipdlg.obj
5b3ed311 856 copy ..\generic\$D\tipwin.obj
760ac9ab 857 copy ..\generic\$D\treectlg.obj
426d5745
DW
858 copy ..\generic\$D\treelay.obj
859 copy ..\generic\$D\wizard.obj
16a12a3d
DW
860
861$(HTMLLIBOBJS):
f38374d0 862 copy ..\html\$D\helpctrl.obj
16a12a3d
DW
863 copy ..\html\$D\helpdata.obj
864 copy ..\html\$D\helpfrm.obj
865 copy ..\html\$D\htmlcell.obj
866 copy ..\html\$D\htmlfilt.obj
867 copy ..\html\$D\htmlpars.obj
868 copy ..\html\$D\htmltag.obj
869 copy ..\html\$D\htmlwin.obj
870 copy ..\html\$D\htmprint.obj
426d5745 871 copy ..\html\$D\m_dflist.obj
16a12a3d
DW
872 copy ..\html\$D\m_fonts.obj
873 copy ..\html\$D\m_hline.obj
874 copy ..\html\$D\m_image.obj
875 copy ..\html\$D\m_layout.obj
876 copy ..\html\$D\m_links.obj
877 copy ..\html\$D\m_list.obj
426d5745 878 copy ..\html\$D\m_meta.obj
16a12a3d
DW
879 copy ..\html\$D\m_pre.obj
880 copy ..\html\$D\m_tables.obj
16a12a3d 881 copy ..\html\$D\winpars.obj
9fea1a5d 882
11e59d47 883$(OS2LIBOBJS1):
77cd51c3
DW
884 copy ..\os2\$D\accel.obj
885 copy ..\os2\$D\app.obj
886 copy ..\os2\$D\bitmap.obj
887 copy ..\os2\$D\bmpbuttn.obj
888 copy ..\os2\$D\brush.obj
889 copy ..\os2\$D\button.obj
0616b838
DW
890 copy ..\os2\$D\checkbox.obj
891 copy ..\os2\$D\checklst.obj
892 copy ..\os2\$D\choice.obj
893 copy ..\os2\$D\clipbrd.obj
45fcbf3b
DW
894 copy ..\os2\$D\colour.obj
895 copy ..\os2\$D\combobox.obj
896 copy ..\os2\$D\control.obj
4486e1be 897 copy ..\os2\$D\cursor.obj
23e4b7d8 898 copy ..\os2\$D\data.obj
e6ebb514 899 copy ..\os2\$D\dataobj.obj
77cd51c3 900 copy ..\os2\$D\dc.obj
ce44c50e
DW
901 copy ..\os2\$D\dcclient.obj
902 copy ..\os2\$D\dcmemory.obj
903 copy ..\os2\$D\dcprint.obj
904 copy ..\os2\$D\dcscreen.obj
77cd51c3 905 copy ..\os2\$D\dialog.obj
6f38c86f 906 copy ..\os2\$D\dir.obj
27476f73 907 copy ..\os2\$D\dirdlg.obj
f0a56ab0
DW
908 copy ..\os2\$D\dnd.obj
909 copy ..\os2\$D\filedlg.obj
21802234
DW
910 copy ..\os2\$D\font.obj
911 copy ..\os2\$D\fontdlg.obj
aa2097dd
DW
912 copy ..\os2\$D\fontenum.obj
913 copy ..\os2\$D\fontutil.obj
77cd51c3 914 copy ..\os2\$D\frame.obj
0371a691 915 copy ..\os2\$D\gauge.obj
97507cce 916 copy ..\os2\$D\gdiimage.obj
0371a691 917 copy ..\os2\$D\gdiobj.obj
fb9010ed 918 copy ..\os2\$D\gsocket.obj
29d83fc1 919 copy ..\os2\$D\gsockpm.obj
fb9010ed
DW
920 copy ..\os2\$D\helpwin.obj
921 copy ..\os2\$D\icon.obj
fb9010ed
DW
922 copy ..\os2\$D\iniconf.obj
923 copy ..\os2\$D\joystick.obj
924 copy ..\os2\$D\listbox.obj
75f11ad7
DW
925 copy ..\os2\$D\main.obj
926 copy ..\os2\$D\mdi.obj
927 copy ..\os2\$D\menu.obj
928 copy ..\os2\$D\menuitem.obj
004fd0c8
DW
929
930$(OS2LIBOBJS2):
29d83fc1 931 copy ..\os2\$D\metafile.obj
6f38c86f 932 copy ..\os2\$D\mimetype.obj
1cd04aa2 933 copy ..\os2\$D\minifram.obj
aa2097dd
DW
934 copy ..\os2\$D\msgdlg.obj
935 copy ..\os2\$D\nativdlg.obj
97507cce 936 copy ..\os2\$D\notebook.obj
cdf1e714 937 copy ..\os2\$D\ownerdrw.obj
11e59d47 938 copy ..\os2\$D\palette.obj
cdf1e714 939 copy ..\os2\$D\pen.obj
fb46a9a6 940 copy ..\os2\$D\pnghand.obj
cdf1e714
DW
941 copy ..\os2\$D\print.obj
942 copy ..\os2\$D\radiobox.obj
943 copy ..\os2\$D\radiobut.obj
409c9842
DW
944 copy ..\os2\$D\region.obj
945 copy ..\os2\$D\scrolbar.obj
946 copy ..\os2\$D\settings.obj
947 copy ..\os2\$D\slider.obj
948 copy ..\os2\$D\spinbutt.obj
949 copy ..\os2\$D\spinctrl.obj
950 copy ..\os2\$D\statbmp.obj
951 copy ..\os2\$D\statbox.obj
e6ebb514 952 copy ..\os2\$D\statline.obj
d90895ac 953 copy ..\os2\$D\stattext.obj
d90895ac
DW
954 copy ..\os2\$D\tabctrl.obj
955 copy ..\os2\$D\taskbar.obj
956 copy ..\os2\$D\textctrl.obj
957 copy ..\os2\$D\thread.obj
958 copy ..\os2\$D\timer.obj
16a12a3d 959 copy ..\os2\$D\toolbar.obj
d90895ac 960 copy ..\os2\$D\tooltip.obj
d90895ac
DW
961 copy ..\os2\$D\utils.obj
962 copy ..\os2\$D\utilsexc.obj
963 copy ..\os2\$D\wave.obj
77cd51c3 964 copy ..\os2\$D\window.obj
d4714748 965 copy ..\os2\$D\xpmhand.obj
77cd51c3 966
0e320a79
DW
967# wxWindows library as DLL
968dll:
969 nmake -f makefile.va all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
970
971cleandll:
972 nmake -f makefile.va clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
973
974# wxWindows + app as DLL. Only affects main.cpp.
975dllapp:
976 nmake -f makefile.va all FINAL=$(FINAL) DLL=1
977
978# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
979dllnp:
980 nmake -f makefile.va all FINAL=$(FINAL) DLL=1
981
982# Use this to make dummy.obj and generate a PCH.
983# You might use the dll target, then the pch target, in order to
984# generate a DLL, then a PCH/dummy.obj for compiling your applications with.
985#
986# Explanation: Normally, when compiling a static version of wx.lib, your dummy.obj/PCH
987# are associated with wx.lib. When using a DLL version of wxWindows, however,
988# the DLL is compiled without a PCH, so you only need it for compiling the app.
989# In fact headers are compiled differently depending on whether a DLL is being made
990# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
991# in each case) so you couldn't use the same PCH.
992pch:
993 nmake -f makefile.va pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME)
994
995pch1: dirs $(DUMMYOBJ)
996 echo $(DUMMYOBJ)
997
998!if "$(WXMAKINGDLL)" != "1"
999
1000### Static library
1001
9fea1a5d 1002$(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1)
53a240f0
KB
1003 -touch $(WXDIR)\lib\wxcom1.lib
1004 -del $(WXDIR)\lib\wxcom1.lib
9fea1a5d
DW
1005 ilib $(LIBFLAGS) $@ @<<
1006 $**;
1007<<
1008
1009$(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2)
53a240f0
KB
1010 -touch $(WXDIR)\lib\wxcom2.lib
1011 -del $(WXDIR)\lib\wxcom2.lib
9fea1a5d
DW
1012 ilib $(LIBFLAGS) $@ @<<
1013 $**;
1014<<
1015
e6ebb514 1016$(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
53a240f0
KB
1017 -touch $(WXDIR)\lib\wxcom3.lib
1018 -del $(WXDIR)\lib\wxcom3.lib
e6ebb514
DW
1019 ilib $(LIBFLAGS) $@ @<<
1020 $**;
1021<<
1022
9fea1a5d 1023$(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
53a240f0
KB
1024 -touch $(WXDIR)\lib\wxgen.lib
1025 -del $(WXDIR)\lib\wxgen.lib
9fea1a5d
DW
1026 ilib $(LIBFLAGS) $@ @<<
1027 $**;
1028<<
9fea1a5d 1029
16a12a3d 1030$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
53a240f0
KB
1031 -touch $(WXDIR)\lib\wxhtml.lib
1032 -del $(WXDIR)\lib\wxhtml.lib
16a12a3d
DW
1033 ilib $(LIBFLAGS) $@ @<<
1034 $**;
1035<<
1036
9fea1a5d 1037$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
53a240f0
KB
1038 -touch $(WXDIR)\lib\wxnones.lib
1039 -del $(WXDIR)\lib\wxnones.lib
9fea1a5d
DW
1040 ilib $(LIBFLAGS) $@ @<<
1041 $**;
1042<<
1043
11e59d47 1044$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
53a240f0
KB
1045 -touch $(WXDIR)\lib\wxos21.lib
1046 -del $(WXDIR)\lib\wxos21.lib
11e59d47
DW
1047 ilib $(LIBFLAGS) $@ @<<
1048 $**;
1049<<
1050
1051$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
53a240f0
KB
1052 -touch $(WXDIR)\lib\wxos22.lib
1053 -del $(WXDIR)\lib\wxos22.lib
9fea1a5d
DW
1054 ilib $(LIBFLAGS) $@ @<<
1055 $**;
1056<<
d8530167 1057 del *.obj
9fea1a5d
DW
1058
1059$(WXDIR)\lib\wx.lib: \
1060 $D\dummy.obj \
1061 $(COMTEMPTGT1) \
1062 $(COMTEMPTGT2) \
e6ebb514 1063 $(COMTEMPTGT3) \
9fea1a5d 1064 $(GENTEMPTGT) \
16a12a3d 1065 $(HTMLTEMPTGT) \
9fea1a5d 1066 $(NONESTEMPTGT) \
11e59d47
DW
1067 $(OS2TEMPTGT1) \
1068 $(OS2TEMPTGT2) \
9fea1a5d 1069 $(PERIPH_LIBS)
53a240f0
KB
1070 -touch $(LIBTARGET)
1071 -del $(LIBTARGET)
9fea1a5d
DW
1072 ilib $(LIBFLAGS) $@ @<<
1073 $**;
0e320a79 1074<<
d8530167
DW
1075 del $(COMTEMPTGT1)
1076 del $(COMTEMPTGT2)
1077 del $(COMTEMPTGT3)
1078 del $(GENTEMPTGT)
1079 del $(HTMLTEMPTGT)
1080 del $(NONESTEMPTGT)
1081 del $(OS2TEMPTGT1)
1082 del $(OS2TEMPTGT2)
0e320a79
DW
1083
1084!else
1085
0e320a79 1086# Update the dynamic link library
496fd9fb 1087$(WXDIR)\lib\wx23.dll: $(OBJECTS)
0e320a79
DW
1088 icc @<<
1089 /B" $(LINKFLAGS)" /Fe$@
1090 $(LIBS)
426d5745 1091 $(DUMMYOBJ)
0e320a79 1092 $(OBJECTS)
872ae055 1093 $(WXDIR)\src\os2\wx23.def
0e320a79 1094<<
b9930c63 1095 implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
0e320a79
DW
1096
1097!endif
1098
0e320a79
DW
1099..\common\$D\extended.obj: ..\common\extended.c
1100 icc @<<
1101$(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c
1102<<
1103
1104..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c
1105 icc @<<
1106$(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@ ..\common\y_tab.c
1107<<
1108
1109..\common\y_tab.c: ..\common\dosyacc.c
1110 copy "..\common"\dosyacc.c "..\common"\y_tab.c
1111
1112..\common\lex_yy.c: ..\common\doslex.c
1113 copy "..\common"\doslex.c "..\common"\lex_yy.c
1114
1115$(OBJECTS): $(WXDIR)/include/wx/setup.h
1116
1117..\common\$D\unzip.obj: ..\common\unzip.c
1118 icc @<<
1119$(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c
1120<<
1121
50c375d3
DW
1122png:
1123 cd $(WXDIR)\src\png
1124 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1125 cd $(WXDIR)\src\os2
1126
1127clean_png:
1128 cd $(WXDIR)\src\png
1129 nmake -f makefile.va clean
1130 cd $(WXDIR)\src\os2
1131
1132zlib:
1133 cd $(WXDIR)\src\zlib
1134 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1135 cd $(WXDIR)\src\os2
1136
1137clean_zlib:
1138 cd $(WXDIR)\src\zlib
1139 nmake -f makefile.va clean
1140 cd $(WXDIR)\src\os2
1141
1142jpeg:
1143 cd $(WXDIR)\src\jpeg
1144 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1145 cd $(WXDIR)\src\os2
1146
1147clean_jpeg:
1148 cd $(WXDIR)\src\jpeg
1149 nmake -f makefile.va clean
1150 cd $(WXDIR)\src\os2
1151
1152xpm:
1153 cd $(WXDIR)\src\xpm
1154 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1155 cd $(WXDIR)\src\os2
1156
1157clean_xpm:
1158 cd $(WXDIR)\src\xpm
1159 nmake -f makefile.va clean
1160 cd $(WXDIR)\src\os2
1161
ea51d98d
DW
1162tiff:
1163 cd $(WXDIR)\src\tiff
1164 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1165 cd $(WXDIR)\src\os2
1166
1167clean_tiff:
1168 cd $(WXDIR)\src\tiff
1169 nmake -f makefile.va clean
1170 cd $(WXDIR)\src\os2
1171
426d5745 1172clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
50c375d3
DW
1173 erase /N $(GENDIR)\$D\*.obj
1174 erase /N $(COMMDIR)\$D\*.obj
319445fe 1175 erase /N $(HTMLDIR)\$D\*.obj
50c375d3
DW
1176 erase /N $(OS2DIR)\$D\*.obj
1177 rd $(D)
319445fe
DW
1178 rd ..\generic\$D
1179 rd ..\common\$D
1180 rd ..\html\$D
1181 rd ..\os2\$D
426d5745
DW
1182 del $(LIBTARGET)
1183!if "$(WXMAKINGDLL)" == "1"
496fd9fb 1184 erase /N ..\..\lib\wx23.lib
426d5745 1185!endif
8d7ddd02
DW
1186 erase /N $(COMMDIR)\y_tab.c
1187 erase /N $(COMMDIR)\lex_yy.c
0e320a79
DW
1188
1189cleanall: clean
1190