X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/496fd9fb93d3222159c1d024c25e79eab6abe34c..72c71d39724af116d419295b684dd2946efb3da3:/src/os2/makefile.va?ds=inline diff --git a/src/os2/makefile.va b/src/os2/makefile.va index d0859d67d3..560582afd0 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -101,6 +101,7 @@ 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 \ @@ -115,7 +116,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 \ @@ -145,6 +145,7 @@ GENLIBOBJS= \ choicdgg.obj \ colrdlgg.obj \ dcpsg.obj \ + dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ grid.obj \ @@ -159,7 +160,6 @@ GENLIBOBJS= \ logg.obj \ numdlgg.obj \ panelg.obj \ - plot.obj \ printps.obj \ prntdlgg.obj \ progdlgg.obj \ @@ -209,6 +209,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 \ @@ -216,6 +217,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 \ @@ -239,6 +241,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 \ @@ -292,6 +295,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 @@ -318,6 +322,7 @@ COMLIBOBJS1 = \ docview.obj \ dynarray.obj \ dynlib.obj \ + effects.obj \ encconv.obj \ event.obj \ extended.obj \ @@ -325,6 +330,7 @@ COMLIBOBJS1 = \ file.obj \ fileconf.obj \ filefn.obj \ + filename.obj \ filesys.obj \ fontcmn.obj \ fontmap.obj \ @@ -338,11 +344,11 @@ COMLIBOBJS1 = \ gifdecod.obj \ hash.obj \ helpbase.obj \ - http.obj \ - imagall.obj \ - imagbmp.obj + http.obj COMLIBOBJS2 = \ + imagall.obj \ + imagbmp.obj \ image.obj \ imaggif.obj \ imagjpeg.obj \ @@ -350,6 +356,7 @@ COMLIBOBJS2 = \ imagpng.obj \ imagpnm.obj \ imagtiff.obj \ + imagxpm.obj \ intl.obj \ ipcbase.obj \ layout.obj \ @@ -381,12 +388,12 @@ COMLIBOBJS2 = \ socket.obj \ strconv.obj \ stream.obj \ - string.obj \ - tbarbase.obj \ - textcmn.obj \ - textfile.obj + string.obj COMLIBOBJS3 = \ + tbarbase.obj \ + textcmn.obj \ + textfile.obj \ timercmn.obj \ tokenzr.obj \ treebase.obj \ @@ -402,6 +409,7 @@ COMLIBOBJS3 = \ wincmn.obj \ wxchar.obj \ wxexpr.obj \ + xpmdecod.obj \ y_tab.obj \ zipstrm.obj \ zstream.obj @@ -429,6 +437,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 \ @@ -438,8 +447,8 @@ 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\helpwin.obj \ ..\os2\$D\icon.obj \ @@ -483,7 +492,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 \ @@ -508,6 +518,7 @@ OS2LIBOBJS1 = \ dcprint.obj \ dcscreen.obj \ dialog.obj \ + dir.obj \ dirdlg.obj \ dnd.obj \ filedlg.obj \ @@ -529,10 +540,10 @@ OS2LIBOBJS1 = \ mdi.obj \ menu.obj \ menuitem.obj \ - metafile.obj \ - mimetype.obj + metafile.obj OS2LIBOBJS2 = \ + mimetype.obj \ minifram.obj \ msgdlg.obj \ nativdlg.obj \ @@ -564,7 +575,8 @@ OS2LIBOBJS2 = \ utils.obj \ utilsexc.obj \ wave.obj \ - window.obj + window.obj \ + xpmhand.obj HTMLOBJS = \ ..\html\$D\helpctrl.obj \ @@ -650,6 +662,7 @@ $(COMLIBOBJS1): 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 @@ -657,6 +670,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 @@ -671,10 +685,10 @@ $(COMLIBOBJS1): copy ..\common\$D\hash.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj - copy ..\common\$D\imagall.obj - copy ..\common\$D\imagbmp.obj $(COMLIBOBJS2): + copy ..\common\$D\imagall.obj + copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj copy ..\common\$D\imaggif.obj copy ..\common\$D\imagjpeg.obj @@ -682,6 +696,7 @@ $(COMLIBOBJS2): 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 @@ -714,11 +729,11 @@ $(COMLIBOBJS2): copy ..\common\$D\strconv.obj copy ..\common\$D\stream.obj copy ..\common\$D\string.obj + +$(COMLIBOBJS3): copy ..\common\$D\tbarbase.obj copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj - -$(COMLIBOBJS3): copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj copy ..\common\$D\treebase.obj @@ -734,6 +749,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 @@ -746,6 +762,7 @@ $(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\gridsel.obj @@ -759,7 +776,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 @@ -824,6 +840,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 @@ -846,9 +863,9 @@ $(OS2LIBOBJS1): copy ..\os2\$D\menu.obj copy ..\os2\$D\menuitem.obj copy ..\os2\$D\metafile.obj - copy ..\os2\$D\mimetype.obj $(OS2LIBOBJS2): + copy ..\os2\$D\mimetype.obj copy ..\os2\$D\minifram.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj @@ -881,6 +898,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: @@ -918,57 +936,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) $@ @<< $**; << @@ -985,8 +1003,8 @@ $(WXDIR)\lib\wx.lib: \ $(OS2TEMPTGT1) \ $(OS2TEMPTGT2) \ $(PERIPH_LIBS) - touch $(LIBTARGET) - del $(LIBTARGET) + -touch $(LIBTARGET) + -del $(LIBTARGET) ilib $(LIBFLAGS) $@ @<< $**; << @@ -1008,9 +1026,9 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS) $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\lib\wx23.def + $(WXDIR)\src\os2\wx23.def << - implib $(WXDIR)\lib\wx23.lib $(WXDIR)\lib\wx23.def + implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def !endif