]> git.saurik.com Git - wxWidgets.git/blame - src/os2/makefile.va
Added style parameter to wxPopupWindow ctors so they match the Create method.
[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 \
294 ..\common\$D\strconv.obj \
295 ..\common\$D\stream.obj \
296 ..\common\$D\string.obj \
893758d5 297 ..\common\$D\sysopt.obj \
0e320a79 298 ..\common\$D\tbarbase.obj \
1be7f92a
DW
299 ..\common\$D\textcmn.obj \
300 ..\common\$D\textfile.obj \
0e320a79 301 ..\common\$D\timercmn.obj \
1be7f92a 302 ..\common\$D\tokenzr.obj \
9e914011 303 ..\common\$D\toplvcmn.obj \
1a2bf4eb 304 ..\common\$D\treebase.obj \
1be7f92a
DW
305 ..\common\$D\txtstrm.obj \
306 ..\common\$D\unzip.obj \
307 ..\common\$D\url.obj \
0e320a79 308 ..\common\$D\utilscmn.obj \
0e320a79 309 ..\common\$D\valgen.obj \
1be7f92a 310 ..\common\$D\validate.obj \
0e320a79 311 ..\common\$D\valtext.obj \
0e320a79 312 ..\common\$D\variant.obj \
1be7f92a 313 ..\common\$D\wfstream.obj \
0e320a79 314 ..\common\$D\wincmn.obj \
0e320a79 315 ..\common\$D\wxchar.obj \
1be7f92a 316 ..\common\$D\wxexpr.obj \
a51fb642 317 ..\common\$D\xpmdecod.obj \
1be7f92a
DW
318 ..\common\$D\y_tab.obj \
319 ..\common\$D\zipstrm.obj \
320 ..\common\$D\zstream.obj
0e320a79 321
9fea1a5d 322COMLIBOBJS1 = \
1be7f92a
DW
323 appcmn.obj \
324 choiccmn.obj \
dcd307ee 325 clipcmn.obj \
2d021175 326 clntdata.obj \
426d5745 327 cmdline.obj \
9fea1a5d 328 cmndata.obj \
0367c1c0 329 cmdproc.obj \
9fea1a5d 330 config.obj \
1bcfc0e1 331 containr.obj \
5b3ed311 332 cshelp.obj \
1be7f92a 333 ctrlcmn.obj \
dcd307ee 334 ctrlsub.obj \
610a6ee9 335 datetime.obj \
2e1a688e 336 datstrm.obj \
9fea1a5d 337 db.obj \
254ccb8c 338 dbgrid.obj \
9fea1a5d 339 dbtable.obj \
2e1a688e 340 dcbase.obj \
29d83fc1 341 dircmn.obj \
426d5745 342 dndcmn.obj \
1be7f92a 343 dlgcmn.obj \
2e1a688e 344 dobjcmn.obj \
1be7f92a 345 docmdi.obj \
9fea1a5d 346 docview.obj \
9fea1a5d
DW
347 dynarray.obj \
348 dynlib.obj \
6f38c86f 349 effects.obj \
aa2097dd 350 encconv.obj \
9fea1a5d 351 event.obj \
1be7f92a 352 extended.obj \
8d7ddd02 353 fddlgcmn.obj \
1be7f92a 354 ffile.obj \
9fea1a5d 355 file.obj \
9fea1a5d 356 fileconf.obj \
1be7f92a 357 filefn.obj \
d4714748 358 filename.obj \
1be7f92a
DW
359 filesys.obj \
360 fontcmn.obj \
aa2097dd 361 fontmap.obj \
9fea1a5d 362 framecmn.obj \
1be7f92a 363 fs_inet.obj \
426d5745 364 fs_mem.obj \
2d021175 365 fs_zip.obj
426d5745
DW
366
367COMLIBOBJS2 = \
2d021175 368 ftp.obj \
1bcfc0e1 369 gaugecmn.obj \
8d7ddd02
DW
370 gdicmn.obj \
371 geometry.obj \
0367c1c0
DW
372 gifdecod.obj \
373 hash.obj \
254ccb8c 374 helpbase.obj \
29d83fc1 375 http.obj \
6f38c86f 376 imagall.obj \
d4714748 377 imagbmp.obj \
5b3ed311 378 image.obj \
1be7f92a 379 imaggif.obj \
9fea1a5d 380 imagjpeg.obj \
1be7f92a 381 imagpcx.obj \
426d5745 382 imagpng.obj \
aa2097dd 383 imagpnm.obj \
426d5745 384 imagtiff.obj \
5fd2b2c6 385 imagxpm.obj \
aa2097dd 386 intl.obj \
9fea1a5d 387 ipcbase.obj \
2e1a688e 388 layout.obj \
dcd307ee 389 lboxcmn.obj \
2e1a688e 390 list.obj \
e6ebb514 391 log.obj \
1be7f92a
DW
392 longlong.obj \
393 matrix.obj \
9fea1a5d 394 memory.obj \
476607a7 395 menucmn.obj \
1cd04aa2 396 mimecmn.obj \
9fea1a5d 397 module.obj \
1be7f92a 398 mstream.obj \
0367c1c0 399 nbkbase.obj \
9fea1a5d 400 object.obj \
1be7f92a 401 objstrm.obj \
426d5745 402 odbc.obj \
1be7f92a 403 paper.obj \
0367c1c0 404 popupcmn.obj \
9fea1a5d 405 prntbase.obj \
1be7f92a
DW
406 process.obj \
407 protocol.obj \
1a2bf4eb 408 quantize.obj \
2d021175 409 radiocmn.obj
0367c1c0
DW
410
411COMLIBOBJS3 = \
2d021175 412 regex.obj \
1bcfc0e1 413 resource.obj \
8d7ddd02
DW
414 sckaddr.obj \
415 sckfile.obj \
834999c2 416 sckipc.obj \
1be7f92a
DW
417 sckstrm.obj \
418 serbase.obj \
419 sizer.obj \
420 socket.obj \
0367c1c0 421 strconv.obj \
254ccb8c 422 stream.obj \
29d83fc1 423 string.obj \
893758d5 424 sysopt.obj \
5fd2b2c6 425 tbarbase.obj \
6f38c86f 426 textcmn.obj \
d4714748 427 textfile.obj \
5b3ed311 428 timercmn.obj \
1a2bf4eb 429 tokenzr.obj \
9e914011 430 toplvcmn.obj \
1a2bf4eb 431 treebase.obj \
1be7f92a
DW
432 txtstrm.obj \
433 unzip.obj \
434 url.obj \
9fea1a5d 435 utilscmn.obj \
9fea1a5d 436 valgen.obj \
426d5745 437 validate.obj \
aa2097dd
DW
438 valtext.obj \
439 variant.obj \
1be7f92a 440 wfstream.obj \
9fea1a5d 441 wincmn.obj \
9fea1a5d 442 wxchar.obj \
1be7f92a 443 wxexpr.obj \
a51fb642 444 xpmdecod.obj \
1be7f92a
DW
445 y_tab.obj \
446 zipstrm.obj \
2e1a688e 447 zstream.obj
0e320a79
DW
448
449OS2OBJS = \
77cd51c3
DW
450 ..\os2\$D\accel.obj \
451 ..\os2\$D\app.obj \
452 ..\os2\$D\bitmap.obj \
453 ..\os2\$D\bmpbuttn.obj \
454 ..\os2\$D\brush.obj \
455 ..\os2\$D\button.obj \
0616b838
DW
456 ..\os2\$D\checkbox.obj \
457 ..\os2\$D\checklst.obj \
458 ..\os2\$D\choice.obj \
459 ..\os2\$D\clipbrd.obj \
45fcbf3b
DW
460 ..\os2\$D\colour.obj \
461 ..\os2\$D\combobox.obj \
462 ..\os2\$D\control.obj \
4486e1be 463 ..\os2\$D\cursor.obj \
23e4b7d8 464 ..\os2\$D\data.obj \
6dddc146 465 ..\os2\$D\dataobj.obj \
c3d43472 466 ..\os2\$D\dc.obj \
ce44c50e
DW
467 ..\os2\$D\dcclient.obj \
468 ..\os2\$D\dcmemory.obj \
469 ..\os2\$D\dcprint.obj \
470 ..\os2\$D\dcscreen.obj \
c3d43472 471 ..\os2\$D\dialog.obj \
6f38c86f 472 ..\os2\$D\dir.obj \
27476f73 473 ..\os2\$D\dirdlg.obj \
f0a56ab0
DW
474 ..\os2\$D\dnd.obj \
475 ..\os2\$D\filedlg.obj \
21802234
DW
476 ..\os2\$D\font.obj \
477 ..\os2\$D\fontdlg.obj \
aa2097dd
DW
478 ..\os2\$D\fontenum.obj \
479 ..\os2\$D\fontutil.obj \
c3d43472 480 ..\os2\$D\frame.obj \
0371a691 481 ..\os2\$D\gauge.obj \
97507cce 482 ..\os2\$D\gdiimage.obj \
6f38c86f 483 ..\os2\$D\gdiobj.obj \
fb9010ed 484 ..\os2\$D\gsocket.obj \
29d83fc1 485 ..\os2\$D\gsockpm.obj \
fb9010ed
DW
486 ..\os2\$D\helpwin.obj \
487 ..\os2\$D\icon.obj \
fb9010ed
DW
488 ..\os2\$D\iniconf.obj \
489 ..\os2\$D\joystick.obj \
490 ..\os2\$D\listbox.obj \
75f11ad7
DW
491 ..\os2\$D\main.obj \
492 ..\os2\$D\mdi.obj \
493 ..\os2\$D\menu.obj \
494 ..\os2\$D\menuitem.obj \
495 ..\os2\$D\metafile.obj \
1cd04aa2 496 ..\os2\$D\mimetype.obj \
75f11ad7 497 ..\os2\$D\minifram.obj \
cdf1e714
DW
498 ..\os2\$D\msgdlg.obj \
499 ..\os2\$D\nativdlg.obj \
500 ..\os2\$D\notebook.obj \
501 ..\os2\$D\ownerdrw.obj \
502 ..\os2\$D\palette.obj \
503 ..\os2\$D\pen.obj \
fb46a9a6 504 ..\os2\$D\pnghand.obj \
cdf1e714
DW
505 ..\os2\$D\print.obj \
506 ..\os2\$D\radiobox.obj \
507 ..\os2\$D\radiobut.obj \
409c9842
DW
508 ..\os2\$D\region.obj \
509 ..\os2\$D\scrolbar.obj \
510 ..\os2\$D\settings.obj \
511 ..\os2\$D\slider.obj \
512 ..\os2\$D\spinbutt.obj \
513 ..\os2\$D\spinctrl.obj \
514 ..\os2\$D\statbmp.obj \
515 ..\os2\$D\statbox.obj \
e6ebb514 516 ..\os2\$D\statline.obj \
d90895ac 517 ..\os2\$D\stattext.obj \
d90895ac
DW
518 ..\os2\$D\tabctrl.obj \
519 ..\os2\$D\taskbar.obj \
520 ..\os2\$D\textctrl.obj \
521 ..\os2\$D\thread.obj \
522 ..\os2\$D\timer.obj \
523 ..\os2\$D\toolbar.obj \
524 ..\os2\$D\tooltip.obj \
d90895ac
DW
525 ..\os2\$D\utils.obj \
526 ..\os2\$D\utilsexc.obj \
527 ..\os2\$D\wave.obj \
d4714748
DW
528 ..\os2\$D\window.obj \
529 ..\os2\$D\xpmhand.obj
77cd51c3 530
11e59d47 531OS2LIBOBJS1 = \
77cd51c3
DW
532 accel.obj \
533 app.obj \
534 bitmap.obj \
535 bmpbuttn.obj \
536 brush.obj \
537 button.obj \
0616b838
DW
538 checkbox.obj \
539 checklst.obj \
540 choice.obj \
541 clipbrd.obj \
45fcbf3b
DW
542 colour.obj \
543 combobox.obj \
544 control.obj \
4486e1be 545 cursor.obj \
23e4b7d8 546 data.obj \
6dddc146 547 dataobj.obj \
77cd51c3 548 dc.obj \
ce44c50e
DW
549 dcclient.obj \
550 dcmemory.obj \
551 dcprint.obj \
552 dcscreen.obj \
77cd51c3 553 dialog.obj \
6f38c86f 554 dir.obj \
27476f73 555 dirdlg.obj \
f0a56ab0
DW
556 dnd.obj \
557 filedlg.obj \
21802234
DW
558 font.obj \
559 fontdlg.obj \
aa2097dd
DW
560 fontenum.obj \
561 fontutil.obj \
77cd51c3 562 frame.obj \
0371a691 563 gauge.obj \
97507cce 564 gdiimage.obj \
0371a691 565 gdiobj.obj \
fb9010ed 566 gsocket.obj \
29d83fc1 567 gsockpm.obj \
fb9010ed
DW
568 helpwin.obj \
569 icon.obj \
fb9010ed
DW
570 iniconf.obj \
571 joystick.obj \
572 listbox.obj \
75f11ad7
DW
573 main.obj \
574 mdi.obj \
575 menu.obj \
29d83fc1 576 menuitem.obj
11e59d47
DW
577
578OS2LIBOBJS2 = \
29d83fc1 579 metafile.obj \
6f38c86f 580 mimetype.obj \
1cd04aa2 581 minifram.obj \
aa2097dd
DW
582 msgdlg.obj \
583 nativdlg.obj \
97507cce 584 notebook.obj \
cdf1e714
DW
585 ownerdrw.obj \
586 palette.obj \
587 pen.obj \
fb46a9a6 588 pnghand.obj \
cdf1e714
DW
589 print.obj \
590 radiobox.obj \
591 radiobut.obj \
409c9842
DW
592 region.obj \
593 scrolbar.obj \
594 settings.obj \
595 slider.obj \
596 spinbutt.obj \
597 spinctrl.obj \
598 statbmp.obj \
599 statbox.obj \
d90895ac 600 stattext.obj \
e6ebb514 601 statline.obj \
d90895ac
DW
602 tabctrl.obj \
603 taskbar.obj \
604 textctrl.obj \
605 thread.obj \
606 timer.obj \
16a12a3d 607 toolbar.obj \
d90895ac 608 tooltip.obj \
d90895ac
DW
609 utils.obj \
610 utilsexc.obj \
611 wave.obj \
d4714748
DW
612 window.obj \
613 xpmhand.obj
0e320a79
DW
614
615HTMLOBJS = \
f38374d0 616 ..\html\$D\helpctrl.obj \
16a12a3d
DW
617 ..\html\$D\helpdata.obj \
618 ..\html\$D\helpfrm.obj \
0e320a79 619 ..\html\$D\htmlcell.obj \
16a12a3d
DW
620 ..\html\$D\htmlfilt.obj \
621 ..\html\$D\htmlpars.obj \
0e320a79
DW
622 ..\html\$D\htmltag.obj \
623 ..\html\$D\htmlwin.obj \
16a12a3d 624 ..\html\$D\htmprint.obj \
426d5745 625 ..\html\$D\m_dflist.obj \
16a12a3d
DW
626 ..\html\$D\m_fonts.obj \
627 ..\html\$D\m_hline.obj \
628 ..\html\$D\m_image.obj \
629 ..\html\$D\m_layout.obj \
630 ..\html\$D\m_links.obj \
631 ..\html\$D\m_list.obj \
426d5745 632 ..\html\$D\m_meta.obj \
16a12a3d
DW
633 ..\html\$D\m_pre.obj \
634 ..\html\$D\m_tables.obj \
16a12a3d
DW
635 ..\html\$D\winpars.obj
636
637HTMLLIBOBJS = \
f38374d0 638 helpctrl.obj \
16a12a3d
DW
639 helpdata.obj \
640 helpfrm.obj \
641 htmlcell.obj \
642 htmlfilt.obj \
643 htmlpars.obj \
644 htmltag.obj \
645 htmlwin.obj \
646 htmprint.obj \
426d5745 647 m_dflist.obj \
16a12a3d
DW
648 m_fonts.obj \
649 m_hline.obj \
650 m_image.obj \
651 m_layout.obj \
652 m_links.obj \
653 m_list.obj \
426d5745 654 m_meta.obj \
16a12a3d
DW
655 m_pre.obj \
656 m_tables.obj \
16a12a3d 657 winpars.obj
0e320a79
DW
658
659# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
16a12a3d 660OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
0e320a79
DW
661
662# Normal, static library
2d021175 663all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
0e320a79
DW
664
665dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
666
667
668test: $(OS2DIR)\$D\wave.obj
669test2: ..\common\Debug\config.obj
670
2d021175
DW
671# If taking wxWindows from CVS, setup.h doesn't exist yet.
672$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
673 copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
674
675$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h
676 copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h
677
1cd04aa2
DW
678$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
679 icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
680
681$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
426d5745 682 icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
1cd04aa2 683
9fea1a5d 684$(COMLIBOBJS1):
1be7f92a
DW
685 copy ..\common\$D\appcmn.obj
686 copy ..\common\$D\choiccmn.obj
dcd307ee 687 copy ..\common\$D\clipcmn.obj
2d021175 688 copy ..\common\$D\clntdata.obj
426d5745 689 copy ..\common\$D\cmdline.obj
9fea1a5d 690 copy ..\common\$D\cmndata.obj
0367c1c0 691 copy ..\common\$D\cmdproc.obj
9fea1a5d 692 copy ..\common\$D\config.obj
1bcfc0e1 693 copy ..\common\$D\containr.obj
5b3ed311 694 copy ..\common\$D\cshelp.obj
1be7f92a 695 copy ..\common\$D\ctrlcmn.obj
e6ebb514 696 copy ..\common\$D\ctrlsub.obj
610a6ee9 697 copy ..\common\$D\datetime.obj
2e1a688e 698 copy ..\common\$D\datstrm.obj
9fea1a5d 699 copy ..\common\$D\db.obj
254ccb8c 700 copy ..\common\$D\dbgrid.obj
9fea1a5d 701 copy ..\common\$D\dbtable.obj
2e1a688e 702 copy ..\common\$D\dcbase.obj
1be7f92a 703 copy ..\common\$D\dlgcmn.obj
29d83fc1 704 copy ..\common\$D\dircmn.obj
426d5745 705 copy ..\common\$D\dndcmn.obj
2e1a688e 706 copy ..\common\$D\dobjcmn.obj
1be7f92a 707 copy ..\common\$D\docmdi.obj
9fea1a5d 708 copy ..\common\$D\docview.obj
9fea1a5d
DW
709 copy ..\common\$D\dynarray.obj
710 copy ..\common\$D\dynlib.obj
6f38c86f 711 copy ..\common\$D\effects.obj
aa2097dd 712 copy ..\common\$D\encconv.obj
9fea1a5d 713 copy ..\common\$D\event.obj
1be7f92a 714 copy ..\common\$D\extended.obj
8d7ddd02 715 copy ..\common\$D\fddlgcmn.obj
1be7f92a 716 copy ..\common\$D\ffile.obj
9fea1a5d 717 copy ..\common\$D\file.obj
9fea1a5d 718 copy ..\common\$D\fileconf.obj
1be7f92a 719 copy ..\common\$D\filefn.obj
d4714748 720 copy ..\common\$D\filename.obj
1be7f92a
DW
721 copy ..\common\$D\filesys.obj
722 copy ..\common\$D\fontcmn.obj
aa2097dd 723 copy ..\common\$D\fontmap.obj
9fea1a5d 724 copy ..\common\$D\framecmn.obj
1be7f92a 725 copy ..\common\$D\fs_inet.obj
426d5745 726 copy ..\common\$D\fs_mem.obj
1be7f92a 727 copy ..\common\$D\fs_zip.obj
426d5745
DW
728
729$(COMLIBOBJS2):
2d021175 730 copy ..\common\$D\ftp.obj
1bcfc0e1 731 copy ..\common\$D\gaugecmn.obj
8d7ddd02
DW
732 copy ..\common\$D\gdicmn.obj
733 copy ..\common\$D\geometry.obj
0367c1c0
DW
734 copy ..\common\$D\gifdecod.obj
735 copy ..\common\$D\hash.obj
254ccb8c 736 copy ..\common\$D\helpbase.obj
29d83fc1 737 copy ..\common\$D\http.obj
6f38c86f 738 copy ..\common\$D\imagall.obj
d4714748 739 copy ..\common\$D\imagbmp.obj
5b3ed311 740 copy ..\common\$D\image.obj
1be7f92a 741 copy ..\common\$D\imaggif.obj
9fea1a5d 742 copy ..\common\$D\imagjpeg.obj
1be7f92a 743 copy ..\common\$D\imagpcx.obj
9fea1a5d 744 copy ..\common\$D\imagpng.obj
aa2097dd 745 copy ..\common\$D\imagpnm.obj
426d5745 746 copy ..\common\$D\imagtiff.obj
5fd2b2c6 747 copy ..\common\$D\imagxpm.obj
aa2097dd 748 copy ..\common\$D\intl.obj
9fea1a5d 749 copy ..\common\$D\ipcbase.obj
9fea1a5d 750 copy ..\common\$D\layout.obj
dcd307ee 751 copy ..\common\$D\lboxcmn.obj
1be7f92a 752 copy ..\common\$D\list.obj
9fea1a5d 753 copy ..\common\$D\log.obj
e6ebb514
DW
754 copy ..\common\$D\longlong.obj
755 copy ..\common\$D\matrix.obj
756 copy ..\common\$D\memory.obj
476607a7 757 copy ..\common\$D\menucmn.obj
1cd04aa2 758 copy ..\common\$D\mimecmn.obj
e6ebb514
DW
759 copy ..\common\$D\module.obj
760 copy ..\common\$D\mstream.obj
0367c1c0 761 copy ..\common\$D\nbkbase.obj
e6ebb514
DW
762 copy ..\common\$D\object.obj
763 copy ..\common\$D\objstrm.obj
426d5745 764 copy ..\common\$D\odbc.obj
e6ebb514 765 copy ..\common\$D\paper.obj
0367c1c0 766 copy ..\common\$D\popupcmn.obj
e6ebb514
DW
767 copy ..\common\$D\prntbase.obj
768 copy ..\common\$D\process.obj
769 copy ..\common\$D\protocol.obj
1a2bf4eb 770 copy ..\common\$D\quantize.obj
0367c1c0 771 copy ..\common\$D\radiocmn.obj
0367c1c0
DW
772
773$(COMLIBOBJS3):
2d021175 774 copy ..\common\$D\regex.obj
1bcfc0e1 775 copy ..\common\$D\resource.obj
8d7ddd02
DW
776 copy ..\common\$D\sckaddr.obj
777 copy ..\common\$D\sckfile.obj
834999c2 778 copy ..\common\$D\sckipc.obj
e6ebb514
DW
779 copy ..\common\$D\sckstrm.obj
780 copy ..\common\$D\serbase.obj
781 copy ..\common\$D\sizer.obj
782 copy ..\common\$D\socket.obj
783 copy ..\common\$D\strconv.obj
254ccb8c 784 copy ..\common\$D\stream.obj
29d83fc1 785 copy ..\common\$D\string.obj
893758d5 786 copy ..\common\$D\sysopt.obj
5fd2b2c6 787 copy ..\common\$D\tbarbase.obj
6f38c86f 788 copy ..\common\$D\textcmn.obj
d4714748 789 copy ..\common\$D\textfile.obj
5b3ed311 790 copy ..\common\$D\timercmn.obj
1a2bf4eb 791 copy ..\common\$D\tokenzr.obj
9e914011 792 copy ..\common\$D\toplvcmn.obj
1a2bf4eb 793 copy ..\common\$D\treebase.obj
e6ebb514
DW
794 copy ..\common\$D\txtstrm.obj
795 copy ..\common\$D\unzip.obj
796 copy ..\common\$D\url.obj
797 copy ..\common\$D\utilscmn.obj
798 copy ..\common\$D\valgen.obj
799 copy ..\common\$D\validate.obj
aa2097dd
DW
800 copy ..\common\$D\valtext.obj
801 copy ..\common\$D\variant.obj
e6ebb514
DW
802 copy ..\common\$D\wfstream.obj
803 copy ..\common\$D\wincmn.obj
804 copy ..\common\$D\wxchar.obj
805 copy ..\common\$D\wxexpr.obj
a51fb642 806 copy ..\common\$D\xpmdecod.obj
e6ebb514
DW
807 copy ..\common\$D\y_tab.obj
808 copy ..\common\$D\zipstrm.obj
1be7f92a 809 copy ..\common\$D\zstream.obj
9fea1a5d
DW
810
811$(GENLIBOBJS):
e6ebb514 812 copy ..\generic\$D\busyinfo.obj
27e2ed81 813 copy ..\generic\$D\calctrl.obj
0616b838 814 copy ..\generic\$D\caret.obj
9fea1a5d 815 copy ..\generic\$D\choicdgg.obj
e6ebb514 816 copy ..\generic\$D\colrdlgg.obj
426d5745 817 copy ..\generic\$D\dragimgg.obj
e6ebb514 818 copy ..\generic\$D\dcpsg.obj
6f38c86f 819 copy ..\generic\$D\dirctrlg.obj
426d5745 820 copy ..\generic\$D\fontdlgg.obj
8d7ddd02 821 copy ..\generic\$D\fdrepdlg.obj
e6ebb514 822 copy ..\generic\$D\grid.obj
1ec46a5b 823 copy ..\generic\$D\gridctrl.obj
426d5745 824 copy ..\generic\$D\gridsel.obj
e6ebb514
DW
825 copy ..\generic\$D\helpext.obj
826 copy ..\generic\$D\helphtml.obj
827 copy ..\generic\$D\helpwxht.obj
828 copy ..\generic\$D\helpxlp.obj
829 copy ..\generic\$D\imaglist.obj
9fea1a5d 830 copy ..\generic\$D\laywin.obj
e6ebb514
DW
831 copy ..\generic\$D\listctrl.obj
832 copy ..\generic\$D\logg.obj
833 copy ..\generic\$D\numdlgg.obj
9fea1a5d 834 copy ..\generic\$D\panelg.obj
e6ebb514
DW
835 copy ..\generic\$D\printps.obj
836 copy ..\generic\$D\prntdlgg.obj
9fea1a5d
DW
837 copy ..\generic\$D\progdlgg.obj
838 copy ..\generic\$D\prop.obj
839 copy ..\generic\$D\propform.obj
840 copy ..\generic\$D\proplist.obj
841 copy ..\generic\$D\sashwin.obj
0367c1c0
DW
842 copy ..\generic\$D\scrlwing.obj
843 copy ..\generic\$D\spinctlg.obj
9fea1a5d
DW
844 copy ..\generic\$D\splitter.obj
845 copy ..\generic\$D\statusbr.obj
846 copy ..\generic\$D\tabg.obj
426d5745 847 copy ..\generic\$D\tbarsmpl.obj
9fea1a5d
DW
848 copy ..\generic\$D\textdlgg.obj
849 copy ..\generic\$D\tipdlg.obj
5b3ed311 850 copy ..\generic\$D\tipwin.obj
760ac9ab 851 copy ..\generic\$D\treectlg.obj
426d5745
DW
852 copy ..\generic\$D\treelay.obj
853 copy ..\generic\$D\wizard.obj
16a12a3d
DW
854
855$(HTMLLIBOBJS):
f38374d0 856 copy ..\html\$D\helpctrl.obj
16a12a3d
DW
857 copy ..\html\$D\helpdata.obj
858 copy ..\html\$D\helpfrm.obj
859 copy ..\html\$D\htmlcell.obj
860 copy ..\html\$D\htmlfilt.obj
861 copy ..\html\$D\htmlpars.obj
862 copy ..\html\$D\htmltag.obj
863 copy ..\html\$D\htmlwin.obj
864 copy ..\html\$D\htmprint.obj
426d5745 865 copy ..\html\$D\m_dflist.obj
16a12a3d
DW
866 copy ..\html\$D\m_fonts.obj
867 copy ..\html\$D\m_hline.obj
868 copy ..\html\$D\m_image.obj
869 copy ..\html\$D\m_layout.obj
870 copy ..\html\$D\m_links.obj
871 copy ..\html\$D\m_list.obj
426d5745 872 copy ..\html\$D\m_meta.obj
16a12a3d
DW
873 copy ..\html\$D\m_pre.obj
874 copy ..\html\$D\m_tables.obj
16a12a3d 875 copy ..\html\$D\winpars.obj
9fea1a5d 876
11e59d47 877$(OS2LIBOBJS1):
77cd51c3
DW
878 copy ..\os2\$D\accel.obj
879 copy ..\os2\$D\app.obj
880 copy ..\os2\$D\bitmap.obj
881 copy ..\os2\$D\bmpbuttn.obj
882 copy ..\os2\$D\brush.obj
883 copy ..\os2\$D\button.obj
0616b838
DW
884 copy ..\os2\$D\checkbox.obj
885 copy ..\os2\$D\checklst.obj
886 copy ..\os2\$D\choice.obj
887 copy ..\os2\$D\clipbrd.obj
45fcbf3b
DW
888 copy ..\os2\$D\colour.obj
889 copy ..\os2\$D\combobox.obj
890 copy ..\os2\$D\control.obj
4486e1be 891 copy ..\os2\$D\cursor.obj
23e4b7d8 892 copy ..\os2\$D\data.obj
e6ebb514 893 copy ..\os2\$D\dataobj.obj
77cd51c3 894 copy ..\os2\$D\dc.obj
ce44c50e
DW
895 copy ..\os2\$D\dcclient.obj
896 copy ..\os2\$D\dcmemory.obj
897 copy ..\os2\$D\dcprint.obj
898 copy ..\os2\$D\dcscreen.obj
77cd51c3 899 copy ..\os2\$D\dialog.obj
6f38c86f 900 copy ..\os2\$D\dir.obj
27476f73 901 copy ..\os2\$D\dirdlg.obj
f0a56ab0
DW
902 copy ..\os2\$D\dnd.obj
903 copy ..\os2\$D\filedlg.obj
21802234
DW
904 copy ..\os2\$D\font.obj
905 copy ..\os2\$D\fontdlg.obj
aa2097dd
DW
906 copy ..\os2\$D\fontenum.obj
907 copy ..\os2\$D\fontutil.obj
77cd51c3 908 copy ..\os2\$D\frame.obj
0371a691 909 copy ..\os2\$D\gauge.obj
97507cce 910 copy ..\os2\$D\gdiimage.obj
0371a691 911 copy ..\os2\$D\gdiobj.obj
fb9010ed 912 copy ..\os2\$D\gsocket.obj
29d83fc1 913 copy ..\os2\$D\gsockpm.obj
fb9010ed
DW
914 copy ..\os2\$D\helpwin.obj
915 copy ..\os2\$D\icon.obj
fb9010ed
DW
916 copy ..\os2\$D\iniconf.obj
917 copy ..\os2\$D\joystick.obj
918 copy ..\os2\$D\listbox.obj
75f11ad7
DW
919 copy ..\os2\$D\main.obj
920 copy ..\os2\$D\mdi.obj
921 copy ..\os2\$D\menu.obj
922 copy ..\os2\$D\menuitem.obj
004fd0c8
DW
923
924$(OS2LIBOBJS2):
29d83fc1 925 copy ..\os2\$D\metafile.obj
6f38c86f 926 copy ..\os2\$D\mimetype.obj
1cd04aa2 927 copy ..\os2\$D\minifram.obj
aa2097dd
DW
928 copy ..\os2\$D\msgdlg.obj
929 copy ..\os2\$D\nativdlg.obj
97507cce 930 copy ..\os2\$D\notebook.obj
cdf1e714 931 copy ..\os2\$D\ownerdrw.obj
11e59d47 932 copy ..\os2\$D\palette.obj
cdf1e714 933 copy ..\os2\$D\pen.obj
fb46a9a6 934 copy ..\os2\$D\pnghand.obj
cdf1e714
DW
935 copy ..\os2\$D\print.obj
936 copy ..\os2\$D\radiobox.obj
937 copy ..\os2\$D\radiobut.obj
409c9842
DW
938 copy ..\os2\$D\region.obj
939 copy ..\os2\$D\scrolbar.obj
940 copy ..\os2\$D\settings.obj
941 copy ..\os2\$D\slider.obj
942 copy ..\os2\$D\spinbutt.obj
943 copy ..\os2\$D\spinctrl.obj
944 copy ..\os2\$D\statbmp.obj
945 copy ..\os2\$D\statbox.obj
e6ebb514 946 copy ..\os2\$D\statline.obj
d90895ac 947 copy ..\os2\$D\stattext.obj
d90895ac
DW
948 copy ..\os2\$D\tabctrl.obj
949 copy ..\os2\$D\taskbar.obj
950 copy ..\os2\$D\textctrl.obj
951 copy ..\os2\$D\thread.obj
952 copy ..\os2\$D\timer.obj
16a12a3d 953 copy ..\os2\$D\toolbar.obj
d90895ac 954 copy ..\os2\$D\tooltip.obj
d90895ac
DW
955 copy ..\os2\$D\utils.obj
956 copy ..\os2\$D\utilsexc.obj
957 copy ..\os2\$D\wave.obj
77cd51c3 958 copy ..\os2\$D\window.obj
d4714748 959 copy ..\os2\$D\xpmhand.obj
77cd51c3 960
0e320a79
DW
961# wxWindows library as DLL
962dll:
963 nmake -f makefile.va all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
964
965cleandll:
966 nmake -f makefile.va clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
967
968# wxWindows + app as DLL. Only affects main.cpp.
969dllapp:
970 nmake -f makefile.va all FINAL=$(FINAL) DLL=1
971
972# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
973dllnp:
974 nmake -f makefile.va all FINAL=$(FINAL) DLL=1
975
976# Use this to make dummy.obj and generate a PCH.
977# You might use the dll target, then the pch target, in order to
978# generate a DLL, then a PCH/dummy.obj for compiling your applications with.
979#
980# Explanation: Normally, when compiling a static version of wx.lib, your dummy.obj/PCH
981# are associated with wx.lib. When using a DLL version of wxWindows, however,
982# the DLL is compiled without a PCH, so you only need it for compiling the app.
983# In fact headers are compiled differently depending on whether a DLL is being made
984# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
985# in each case) so you couldn't use the same PCH.
986pch:
987 nmake -f makefile.va pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME)
988
989pch1: dirs $(DUMMYOBJ)
990 echo $(DUMMYOBJ)
991
992!if "$(WXMAKINGDLL)" != "1"
993
994### Static library
995
9fea1a5d 996$(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1)
53a240f0
KB
997 -touch $(WXDIR)\lib\wxcom1.lib
998 -del $(WXDIR)\lib\wxcom1.lib
9fea1a5d
DW
999 ilib $(LIBFLAGS) $@ @<<
1000 $**;
1001<<
1002
1003$(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2)
53a240f0
KB
1004 -touch $(WXDIR)\lib\wxcom2.lib
1005 -del $(WXDIR)\lib\wxcom2.lib
9fea1a5d
DW
1006 ilib $(LIBFLAGS) $@ @<<
1007 $**;
1008<<
1009
e6ebb514 1010$(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
53a240f0
KB
1011 -touch $(WXDIR)\lib\wxcom3.lib
1012 -del $(WXDIR)\lib\wxcom3.lib
e6ebb514
DW
1013 ilib $(LIBFLAGS) $@ @<<
1014 $**;
1015<<
1016
9fea1a5d 1017$(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
53a240f0
KB
1018 -touch $(WXDIR)\lib\wxgen.lib
1019 -del $(WXDIR)\lib\wxgen.lib
9fea1a5d
DW
1020 ilib $(LIBFLAGS) $@ @<<
1021 $**;
1022<<
9fea1a5d 1023
16a12a3d 1024$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
53a240f0
KB
1025 -touch $(WXDIR)\lib\wxhtml.lib
1026 -del $(WXDIR)\lib\wxhtml.lib
16a12a3d
DW
1027 ilib $(LIBFLAGS) $@ @<<
1028 $**;
1029<<
1030
9fea1a5d 1031$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
53a240f0
KB
1032 -touch $(WXDIR)\lib\wxnones.lib
1033 -del $(WXDIR)\lib\wxnones.lib
9fea1a5d
DW
1034 ilib $(LIBFLAGS) $@ @<<
1035 $**;
1036<<
1037
11e59d47 1038$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
53a240f0
KB
1039 -touch $(WXDIR)\lib\wxos21.lib
1040 -del $(WXDIR)\lib\wxos21.lib
11e59d47
DW
1041 ilib $(LIBFLAGS) $@ @<<
1042 $**;
1043<<
1044
1045$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
53a240f0
KB
1046 -touch $(WXDIR)\lib\wxos22.lib
1047 -del $(WXDIR)\lib\wxos22.lib
9fea1a5d
DW
1048 ilib $(LIBFLAGS) $@ @<<
1049 $**;
1050<<
d8530167 1051 del *.obj
9fea1a5d
DW
1052
1053$(WXDIR)\lib\wx.lib: \
1054 $D\dummy.obj \
1055 $(COMTEMPTGT1) \
1056 $(COMTEMPTGT2) \
e6ebb514 1057 $(COMTEMPTGT3) \
9fea1a5d 1058 $(GENTEMPTGT) \
16a12a3d 1059 $(HTMLTEMPTGT) \
9fea1a5d 1060 $(NONESTEMPTGT) \
11e59d47
DW
1061 $(OS2TEMPTGT1) \
1062 $(OS2TEMPTGT2) \
9fea1a5d 1063 $(PERIPH_LIBS)
53a240f0
KB
1064 -touch $(LIBTARGET)
1065 -del $(LIBTARGET)
9fea1a5d
DW
1066 ilib $(LIBFLAGS) $@ @<<
1067 $**;
0e320a79 1068<<
d8530167
DW
1069 del $(COMTEMPTGT1)
1070 del $(COMTEMPTGT2)
1071 del $(COMTEMPTGT3)
1072 del $(GENTEMPTGT)
1073 del $(HTMLTEMPTGT)
1074 del $(NONESTEMPTGT)
1075 del $(OS2TEMPTGT1)
1076 del $(OS2TEMPTGT2)
0e320a79
DW
1077
1078!else
1079
0e320a79 1080# Update the dynamic link library
496fd9fb 1081$(WXDIR)\lib\wx23.dll: $(OBJECTS)
0e320a79
DW
1082 icc @<<
1083 /B" $(LINKFLAGS)" /Fe$@
1084 $(LIBS)
426d5745 1085 $(DUMMYOBJ)
0e320a79 1086 $(OBJECTS)
872ae055 1087 $(WXDIR)\src\os2\wx23.def
0e320a79 1088<<
b9930c63 1089 implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
0e320a79
DW
1090
1091!endif
1092
0e320a79
DW
1093..\common\$D\extended.obj: ..\common\extended.c
1094 icc @<<
1095$(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c
1096<<
1097
1098..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c
1099 icc @<<
1100$(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@ ..\common\y_tab.c
1101<<
1102
1103..\common\y_tab.c: ..\common\dosyacc.c
1104 copy "..\common"\dosyacc.c "..\common"\y_tab.c
1105
1106..\common\lex_yy.c: ..\common\doslex.c
1107 copy "..\common"\doslex.c "..\common"\lex_yy.c
1108
1109$(OBJECTS): $(WXDIR)/include/wx/setup.h
1110
1111..\common\$D\unzip.obj: ..\common\unzip.c
1112 icc @<<
1113$(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c
1114<<
1115
50c375d3
DW
1116png:
1117 cd $(WXDIR)\src\png
1118 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1119 cd $(WXDIR)\src\os2
1120
1121clean_png:
1122 cd $(WXDIR)\src\png
1123 nmake -f makefile.va clean
1124 cd $(WXDIR)\src\os2
1125
1126zlib:
1127 cd $(WXDIR)\src\zlib
1128 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1129 cd $(WXDIR)\src\os2
1130
1131clean_zlib:
1132 cd $(WXDIR)\src\zlib
1133 nmake -f makefile.va clean
1134 cd $(WXDIR)\src\os2
1135
1136jpeg:
1137 cd $(WXDIR)\src\jpeg
1138 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1139 cd $(WXDIR)\src\os2
1140
1141clean_jpeg:
1142 cd $(WXDIR)\src\jpeg
1143 nmake -f makefile.va clean
1144 cd $(WXDIR)\src\os2
1145
1146xpm:
1147 cd $(WXDIR)\src\xpm
1148 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1149 cd $(WXDIR)\src\os2
1150
1151clean_xpm:
1152 cd $(WXDIR)\src\xpm
1153 nmake -f makefile.va clean
1154 cd $(WXDIR)\src\os2
1155
ea51d98d
DW
1156tiff:
1157 cd $(WXDIR)\src\tiff
1158 nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
1159 cd $(WXDIR)\src\os2
1160
1161clean_tiff:
1162 cd $(WXDIR)\src\tiff
1163 nmake -f makefile.va clean
1164 cd $(WXDIR)\src\os2
1165
426d5745 1166clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
50c375d3
DW
1167 erase /N $(GENDIR)\$D\*.obj
1168 erase /N $(COMMDIR)\$D\*.obj
319445fe 1169 erase /N $(HTMLDIR)\$D\*.obj
50c375d3
DW
1170 erase /N $(OS2DIR)\$D\*.obj
1171 rd $(D)
319445fe
DW
1172 rd ..\generic\$D
1173 rd ..\common\$D
1174 rd ..\html\$D
1175 rd ..\os2\$D
426d5745
DW
1176 del $(LIBTARGET)
1177!if "$(WXMAKINGDLL)" == "1"
496fd9fb 1178 erase /N ..\..\lib\wx23.lib
426d5745 1179!endif
8d7ddd02
DW
1180 erase /N $(COMMDIR)\y_tab.c
1181 erase /N $(COMMDIR)\lex_yy.c
0e320a79
DW
1182
1183cleanall: clean
1184