X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/760ac9abdd63651ec8e30e7b365b8d4a9ad927e6..4176fb7d0f7f19abcd1ac40e29e9fe107a9e0f6a:/src/os2/makefile.va?ds=inline diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 1bd843ce90..fbd85763b8 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -101,9 +101,11 @@ GENERICOBJS= \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ ..\generic\$D\fontdlgg.obj \ ..\generic\$D\grid.obj \ + ..\generic\$D\gridctrl.obj \ ..\generic\$D\gridsel.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ @@ -115,7 +117,6 @@ GENERICOBJS= \ ..\generic\$D\logg.obj \ ..\generic\$D\numdlgg.obj \ ..\generic\$D\panelg.obj \ - ..\generic\$D\plot.obj \ ..\generic\$D\printps.obj \ ..\generic\$D\prntdlgg.obj \ ..\generic\$D\progdlgg.obj \ @@ -123,13 +124,15 @@ GENERICOBJS= \ ..\generic\$D\propform.obj \ ..\generic\$D\proplist.obj \ ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrolwin.obj \ + ..\generic\$D\scrlwing.obj \ + ..\generic\$D\spinctlg.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ ..\generic\$D\tabg.obj \ ..\generic\$D\tbarsmpl.obj \ ..\generic\$D\textdlgg.obj \ ..\generic\$D\tipdlg.obj \ + ..\generic\$D\tipwin.obj \ ..\generic\$D\treectlg.obj \ ..\generic\$D\treelay.obj \ ..\generic\$D\wizard.obj @@ -144,9 +147,11 @@ GENLIBOBJS= \ choicdgg.obj \ colrdlgg.obj \ dcpsg.obj \ + dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ grid.obj \ + gridctrl.obj \ gridsel.obj \ helpext.obj \ helphtml.obj \ @@ -158,7 +163,6 @@ GENLIBOBJS= \ logg.obj \ numdlgg.obj \ panelg.obj \ - plot.obj \ printps.obj \ prntdlgg.obj \ progdlgg.obj \ @@ -166,13 +170,15 @@ GENLIBOBJS= \ propform.obj \ proplist.obj \ sashwin.obj \ - scrolwin.obj \ + scrlwing.obj \ + spinctlg.obj \ splitter.obj \ statusbr.obj \ tabg.obj \ tbarsmpl.obj \ textdlgg.obj \ tipdlg.obj \ + tipwin.obj \ treectlg.obj \ treelay.obj \ wizard.obj @@ -188,7 +194,9 @@ COMMONOBJS = \ ..\common\$D\clipcmn.obj \ ..\common\$D\cmdline.obj \ ..\common\$D\cmndata.obj \ + ..\common\$D\cmdproc.obj \ ..\common\$D\config.obj \ + ..\common\$D\cshelp.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ ..\common\$D\datetime.obj \ @@ -196,9 +204,11 @@ COMMONOBJS = \ !if "$(WXMAKINGDLL)" != "1" # don't have an ODBC database ..\common\$D\db.obj \ + ..\common\$D\dbgrid.obj \ ..\common\$D\dbtable.obj \ !endif ..\common\$D\dcbase.obj \ + ..\common\$D\dircmn.obj \ ..\common\$D\dlgcmn.obj \ ..\common\$D\dndcmn.obj \ ..\common\$D\dobjcmn.obj \ @@ -206,6 +216,7 @@ COMMONOBJS = \ ..\common\$D\docview.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\effects.obj \ ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ @@ -213,6 +224,7 @@ COMMONOBJS = \ ..\common\$D\file.obj \ ..\common\$D\fileconf.obj \ ..\common\$D\filefn.obj \ + ..\common\$D\filename.obj \ ..\common\$D\filesys.obj \ ..\common\$D\fontcmn.obj \ ..\common\$D\fontmap.obj \ @@ -221,6 +233,7 @@ COMMONOBJS = \ ..\common\$D\fs_mem.obj \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ + ..\common\$D\gaugecmn.obj \ ..\common\$D\gdicmn.obj \ ..\common\$D\geometry.obj \ ..\common\$D\gifdecod.obj \ @@ -236,6 +249,7 @@ COMMONOBJS = \ ..\common\$D\imagpng.obj \ ..\common\$D\imagpnm.obj \ ..\common\$D\imagtiff.obj \ + ..\common\$D\imagxpm.obj \ ..\common\$D\intl.obj \ ..\common\$D\ipcbase.obj \ ..\common\$D\layout.obj \ @@ -249,6 +263,7 @@ COMMONOBJS = \ ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ + ..\common\$D\nbkbase.obj \ ..\common\$D\object.obj \ ..\common\$D\objstrm.obj \ !if "$(WXMAKINGDLL)" != "1" @@ -256,10 +271,12 @@ COMMONOBJS = \ ..\common\$D\odbc.obj \ !endif ..\common\$D\paper.obj \ + ..\common\$D\popupcmn.obj \ ..\common\$D\prntbase.obj \ ..\common\$D\process.obj \ ..\common\$D\protocol.obj \ ..\common\$D\quantize.obj \ + ..\common\$D\radiocmn.obj \ ..\common\$D\resource.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ @@ -289,6 +306,7 @@ COMMONOBJS = \ ..\common\$D\wincmn.obj \ ..\common\$D\wxchar.obj \ ..\common\$D\wxexpr.obj \ + ..\common\$D\xpmdecod.obj \ ..\common\$D\y_tab.obj \ ..\common\$D\zipstrm.obj \ ..\common\$D\zstream.obj @@ -299,14 +317,18 @@ COMLIBOBJS1 = \ clipcmn.obj \ cmdline.obj \ cmndata.obj \ + cmdproc.obj \ config.obj \ + cshelp.obj \ ctrlcmn.obj \ ctrlsub.obj \ datetime.obj \ datstrm.obj \ db.obj \ + dbgrid.obj \ dbtable.obj \ dcbase.obj \ + dircmn.obj \ dndcmn.obj \ dlgcmn.obj \ dobjcmn.obj \ @@ -314,6 +336,7 @@ COMLIBOBJS1 = \ docview.obj \ dynarray.obj \ dynlib.obj \ + effects.obj \ encconv.obj \ event.obj \ extended.obj \ @@ -321,6 +344,7 @@ COMLIBOBJS1 = \ file.obj \ fileconf.obj \ filefn.obj \ + filename.obj \ filesys.obj \ fontcmn.obj \ fontmap.obj \ @@ -329,23 +353,25 @@ COMLIBOBJS1 = \ fs_mem.obj \ fs_zip.obj \ ftp.obj \ + gaugecmn.obj \ gdicmn.obj \ - geometry.obj \ + geometry.obj + +COMLIBOBJS2 = \ gifdecod.obj \ hash.obj \ helpbase.obj \ http.obj \ imagall.obj \ imagbmp.obj \ - image.obj - -COMLIBOBJS2 = \ + image.obj \ imaggif.obj \ imagjpeg.obj \ imagpcx.obj \ imagpng.obj \ imagpnm.obj \ imagtiff.obj \ + imagxpm.obj \ intl.obj \ ipcbase.obj \ layout.obj \ @@ -359,18 +385,23 @@ COMLIBOBJS2 = \ mimecmn.obj \ module.obj \ mstream.obj \ + nbkbase.obj \ object.obj \ objstrm.obj \ odbc.obj \ paper.obj \ + popupcmn.obj \ prntbase.obj \ process.obj \ protocol.obj \ quantize.obj \ + radiocmn.obj \ resource.obj \ sckaddr.obj \ sckfile.obj \ - sckipc.obj \ + sckipc.obj + +COMLIBOBJS3 = \ sckstrm.obj \ serbase.obj \ sizer.obj \ @@ -381,9 +412,7 @@ COMLIBOBJS2 = \ tbarbase.obj \ textcmn.obj \ textfile.obj \ - timercmn.obj - -COMLIBOBJS3 = \ + timercmn.obj \ tokenzr.obj \ treebase.obj \ txtstrm.obj \ @@ -398,6 +427,7 @@ COMLIBOBJS3 = \ wincmn.obj \ wxchar.obj \ wxexpr.obj \ + xpmdecod.obj \ y_tab.obj \ zipstrm.obj \ zstream.obj @@ -425,6 +455,7 @@ OS2OBJS = \ ..\os2\$D\dcprint.obj \ ..\os2\$D\dcscreen.obj \ ..\os2\$D\dialog.obj \ + ..\os2\$D\dir.obj \ ..\os2\$D\dirdlg.obj \ ..\os2\$D\dnd.obj \ ..\os2\$D\filedlg.obj \ @@ -434,9 +465,10 @@ OS2OBJS = \ ..\os2\$D\fontutil.obj \ ..\os2\$D\frame.obj \ ..\os2\$D\gauge.obj \ - ..\os2\$D\gdiobj.obj \ ..\os2\$D\gdiimage.obj \ + ..\os2\$D\gdiobj.obj \ ..\os2\$D\gsocket.obj \ + ..\os2\$D\gsockpm.obj \ ..\os2\$D\helpwin.obj \ ..\os2\$D\icon.obj \ ..\os2\$D\iniconf.obj \ @@ -479,7 +511,8 @@ OS2OBJS = \ ..\os2\$D\utils.obj \ ..\os2\$D\utilsexc.obj \ ..\os2\$D\wave.obj \ - ..\os2\$D\window.obj + ..\os2\$D\window.obj \ + ..\os2\$D\xpmhand.obj OS2LIBOBJS1 = \ accel.obj \ @@ -504,6 +537,7 @@ OS2LIBOBJS1 = \ dcprint.obj \ dcscreen.obj \ dialog.obj \ + dir.obj \ dirdlg.obj \ dnd.obj \ filedlg.obj \ @@ -516,6 +550,7 @@ OS2LIBOBJS1 = \ gdiimage.obj \ gdiobj.obj \ gsocket.obj \ + gsockpm.obj \ helpwin.obj \ icon.obj \ iniconf.obj \ @@ -524,11 +559,11 @@ OS2LIBOBJS1 = \ main.obj \ mdi.obj \ menu.obj \ - menuitem.obj \ - metafile.obj \ - mimetype.obj + menuitem.obj OS2LIBOBJS2 = \ + metafile.obj \ + mimetype.obj \ minifram.obj \ msgdlg.obj \ nativdlg.obj \ @@ -560,7 +595,8 @@ OS2LIBOBJS2 = \ utils.obj \ utilsexc.obj \ wave.obj \ - window.obj + window.obj \ + xpmhand.obj HTMLOBJS = \ ..\html\$D\helpctrl.obj \ @@ -630,21 +666,26 @@ $(COMLIBOBJS1): copy ..\common\$D\clipcmn.obj copy ..\common\$D\cmdline.obj copy ..\common\$D\cmndata.obj + copy ..\common\$D\cmdproc.obj copy ..\common\$D\config.obj + copy ..\common\$D\cshelp.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.obj copy ..\common\$D\datetime.obj copy ..\common\$D\datstrm.obj copy ..\common\$D\db.obj + copy ..\common\$D\dbgrid.obj copy ..\common\$D\dbtable.obj copy ..\common\$D\dcbase.obj copy ..\common\$D\dlgcmn.obj + copy ..\common\$D\dircmn.obj copy ..\common\$D\dndcmn.obj copy ..\common\$D\dobjcmn.obj copy ..\common\$D\docmdi.obj copy ..\common\$D\docview.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\effects.obj copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj @@ -652,6 +693,7 @@ $(COMLIBOBJS1): copy ..\common\$D\file.obj copy ..\common\$D\fileconf.obj copy ..\common\$D\filefn.obj + copy ..\common\$D\filename.obj copy ..\common\$D\filesys.obj copy ..\common\$D\fontcmn.obj copy ..\common\$D\fontmap.obj @@ -660,8 +702,11 @@ $(COMLIBOBJS1): copy ..\common\$D\fs_mem.obj copy ..\common\$D\fs_zip.obj copy ..\common\$D\ftp.obj + copy ..\common\$D\gaugecmn.obj copy ..\common\$D\gdicmn.obj copy ..\common\$D\geometry.obj + +$(COMLIBOBJS2): copy ..\common\$D\gifdecod.obj copy ..\common\$D\hash.obj copy ..\common\$D\helpbase.obj @@ -669,14 +714,13 @@ $(COMLIBOBJS1): copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj - -$(COMLIBOBJS2): copy ..\common\$D\imaggif.obj copy ..\common\$D\imagjpeg.obj copy ..\common\$D\imagpcx.obj copy ..\common\$D\imagpng.obj copy ..\common\$D\imagpnm.obj copy ..\common\$D\imagtiff.obj + copy ..\common\$D\imagxpm.obj copy ..\common\$D\intl.obj copy ..\common\$D\ipcbase.obj copy ..\common\$D\layout.obj @@ -690,18 +734,23 @@ $(COMLIBOBJS2): copy ..\common\$D\mimecmn.obj copy ..\common\$D\module.obj copy ..\common\$D\mstream.obj + copy ..\common\$D\nbkbase.obj copy ..\common\$D\object.obj copy ..\common\$D\objstrm.obj copy ..\common\$D\odbc.obj copy ..\common\$D\paper.obj + copy ..\common\$D\popupcmn.obj copy ..\common\$D\prntbase.obj copy ..\common\$D\process.obj copy ..\common\$D\protocol.obj copy ..\common\$D\quantize.obj + copy ..\common\$D\radiocmn.obj copy ..\common\$D\resource.obj copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckfile.obj copy ..\common\$D\sckipc.obj + +$(COMLIBOBJS3): copy ..\common\$D\sckstrm.obj copy ..\common\$D\serbase.obj copy ..\common\$D\sizer.obj @@ -713,8 +762,6 @@ $(COMLIBOBJS2): copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj copy ..\common\$D\timercmn.obj - -$(COMLIBOBJS3): copy ..\common\$D\tokenzr.obj copy ..\common\$D\treebase.obj copy ..\common\$D\txtstrm.obj @@ -729,6 +776,7 @@ $(COMLIBOBJS3): copy ..\common\$D\wincmn.obj copy ..\common\$D\wxchar.obj copy ..\common\$D\wxexpr.obj + copy ..\common\$D\xpmdecod.obj copy ..\common\$D\y_tab.obj copy ..\common\$D\zipstrm.obj copy ..\common\$D\zstream.obj @@ -741,8 +789,10 @@ $(GENLIBOBJS): copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dragimgg.obj copy ..\generic\$D\dcpsg.obj + copy ..\generic\$D\dirctrlg.obj copy ..\generic\$D\fontdlgg.obj copy ..\generic\$D\grid.obj + copy ..\generic\$D\gridctrl.obj copy ..\generic\$D\gridsel.obj copy ..\generic\$D\helpext.obj copy ..\generic\$D\helphtml.obj @@ -754,7 +804,6 @@ $(GENLIBOBJS): copy ..\generic\$D\logg.obj copy ..\generic\$D\numdlgg.obj copy ..\generic\$D\panelg.obj - copy ..\generic\$D\plot.obj copy ..\generic\$D\printps.obj copy ..\generic\$D\prntdlgg.obj copy ..\generic\$D\progdlgg.obj @@ -762,13 +811,15 @@ $(GENLIBOBJS): copy ..\generic\$D\propform.obj copy ..\generic\$D\proplist.obj copy ..\generic\$D\sashwin.obj - copy ..\generic\$D\scrolwin.obj + copy ..\generic\$D\scrlwing.obj + copy ..\generic\$D\spinctlg.obj copy ..\generic\$D\splitter.obj copy ..\generic\$D\statusbr.obj copy ..\generic\$D\tabg.obj copy ..\generic\$D\tbarsmpl.obj copy ..\generic\$D\textdlgg.obj copy ..\generic\$D\tipdlg.obj + copy ..\generic\$D\tipwin.obj copy ..\generic\$D\treectlg.obj copy ..\generic\$D\treelay.obj copy ..\generic\$D\wizard.obj @@ -818,6 +869,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\dcprint.obj copy ..\os2\$D\dcscreen.obj copy ..\os2\$D\dialog.obj + copy ..\os2\$D\dir.obj copy ..\os2\$D\dirdlg.obj copy ..\os2\$D\dnd.obj copy ..\os2\$D\filedlg.obj @@ -830,6 +882,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\gdiimage.obj copy ..\os2\$D\gdiobj.obj copy ..\os2\$D\gsocket.obj + copy ..\os2\$D\gsockpm.obj copy ..\os2\$D\helpwin.obj copy ..\os2\$D\icon.obj copy ..\os2\$D\iniconf.obj @@ -839,10 +892,10 @@ $(OS2LIBOBJS1): copy ..\os2\$D\mdi.obj copy ..\os2\$D\menu.obj copy ..\os2\$D\menuitem.obj - copy ..\os2\$D\metafile.obj - copy ..\os2\$D\mimetype.obj $(OS2LIBOBJS2): + copy ..\os2\$D\metafile.obj + copy ..\os2\$D\mimetype.obj copy ..\os2\$D\minifram.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj @@ -875,6 +928,7 @@ $(OS2LIBOBJS2): copy ..\os2\$D\utilsexc.obj copy ..\os2\$D\wave.obj copy ..\os2\$D\window.obj + copy ..\os2\$D\xpmhand.obj # wxWindows library as DLL dll: @@ -912,57 +966,57 @@ pch1: dirs $(DUMMYOBJ) ### Static library $(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1) - touch $(WXDIR)\lib\wxcom1.lib - del $(WXDIR)\lib\wxcom1.lib + -touch $(WXDIR)\lib\wxcom1.lib + -del $(WXDIR)\lib\wxcom1.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2) - touch $(WXDIR)\lib\wxcom2.lib - del $(WXDIR)\lib\wxcom2.lib + -touch $(WXDIR)\lib\wxcom2.lib + -del $(WXDIR)\lib\wxcom2.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3) - touch $(WXDIR)\lib\wxcom3.lib - del $(WXDIR)\lib\wxcom3.lib + -touch $(WXDIR)\lib\wxcom3.lib + -del $(WXDIR)\lib\wxcom3.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS) - touch $(WXDIR)\lib\wxgen.lib - del $(WXDIR)\lib\wxgen.lib + -touch $(WXDIR)\lib\wxgen.lib + -del $(WXDIR)\lib\wxgen.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS) - touch $(WXDIR)\lib\wxhtml.lib - del $(WXDIR)\lib\wxhtml.lib + -touch $(WXDIR)\lib\wxhtml.lib + -del $(WXDIR)\lib\wxhtml.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS) - touch $(WXDIR)\lib\wxnones.lib - del $(WXDIR)\lib\wxnones.lib + -touch $(WXDIR)\lib\wxnones.lib + -del $(WXDIR)\lib\wxnones.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1) - touch $(WXDIR)\lib\wxos21.lib - del $(WXDIR)\lib\wxos21.lib + -touch $(WXDIR)\lib\wxos21.lib + -del $(WXDIR)\lib\wxos21.lib ilib $(LIBFLAGS) $@ @<< $**; << $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2) - touch $(WXDIR)\lib\wxos22.lib - del $(WXDIR)\lib\wxos22.lib + -touch $(WXDIR)\lib\wxos22.lib + -del $(WXDIR)\lib\wxos22.lib ilib $(LIBFLAGS) $@ @<< $**; << @@ -979,8 +1033,8 @@ $(WXDIR)\lib\wx.lib: \ $(OS2TEMPTGT1) \ $(OS2TEMPTGT2) \ $(PERIPH_LIBS) - touch $(LIBTARGET) - del $(LIBTARGET) + -touch $(LIBTARGET) + -del $(LIBTARGET) ilib $(LIBFLAGS) $@ @<< $**; << @@ -996,15 +1050,15 @@ $(WXDIR)\lib\wx.lib: \ !else # Update the dynamic link library -$(WXDIR)\lib\wx22.dll: $(OBJECTS) +$(WXDIR)\lib\wx23.dll: $(OBJECTS) icc @<< /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\lib\wx22.def + $(WXDIR)\src\os2\wx23.def << - implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def + implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def !endif @@ -1100,7 +1154,7 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t rd ..\os2\$D del $(LIBTARGET) !if "$(WXMAKINGDLL)" == "1" - erase /N ..\..\lib\wx22.lib + erase /N ..\..\lib\wx23.lib !endif cleanall: clean