X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bd5bbc948bd22c5a0edde9e35e4995c919f593b..0bd55cfa2c5c18d4e9241cf90195e30d0be5d905:/src/os2/makefile.va diff --git a/src/os2/makefile.va b/src/os2/makefile.va index cde236d408..4863d1cb49 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -96,6 +96,7 @@ $(CPPFLAGS) /Fo$@ /Tp $< GENERICOBJS= \ ..\generic\$D\busyinfo.obj \ + ..\generic\$D\calctrl.obj \ ..\generic\$D\caret.obj \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ @@ -111,6 +112,7 @@ 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 \ @@ -131,6 +133,7 @@ GENERICOBJS= \ GENLIBOBJS= \ busyinfo.obj \ + calctrl.obj \ caret.obj \ choicdgg.obj \ colrdlgg.obj \ @@ -146,6 +149,7 @@ GENLIBOBJS= \ logg.obj \ numdlgg.obj \ panelg.obj \ + plot.obj \ printps.obj \ prntdlgg.obj \ progdlgg.obj \ @@ -175,7 +179,7 @@ COMMONOBJS = \ ..\common\$D\config.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ - ..\common\$D\date.obj \ + ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ @@ -186,6 +190,7 @@ COMMONOBJS = \ ..\common\$D\docview.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ ..\common\$D\ffile.obj \ @@ -194,6 +199,7 @@ COMMONOBJS = \ ..\common\$D\filefn.obj \ ..\common\$D\filesys.obj \ ..\common\$D\fontcmn.obj \ + ..\common\$D\fontmap.obj \ ..\common\$D\framecmn.obj \ ..\common\$D\fs_inet.obj \ ..\common\$D\fs_zip.obj \ @@ -220,12 +226,12 @@ COMMONOBJS = \ ..\common\$D\longlong.obj \ ..\common\$D\matrix.obj \ ..\common\$D\memory.obj \ - ..\common\$D\mimetype.obj \ + ..\common\$D\menucmn.obj \ + ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ ..\common\$D\object.obj \ ..\common\$D\objstrm.obj \ - ..\common\$D\odbc.obj \ ..\common\$D\paper.obj \ ..\common\$D\prntbase.obj \ ..\common\$D\process.obj \ @@ -242,10 +248,8 @@ COMMONOBJS = \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ ..\common\$D\tbarbase.obj \ - ..\common\$D\tbarsmpl.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ - ..\common\$D\time.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ ..\common\$D\txtstrm.obj \ @@ -272,7 +276,7 @@ COMLIBOBJS1 = \ config.obj \ ctrlcmn.obj \ ctrlsub.obj \ - date.obj \ + datetime.obj \ datstrm.obj \ db.obj \ dbtable.obj \ @@ -283,6 +287,7 @@ COMLIBOBJS1 = \ docview.obj \ dynarray.obj \ dynlib.obj \ + encconv.obj \ event.obj \ extended.obj \ ffile.obj \ @@ -291,6 +296,7 @@ COMLIBOBJS1 = \ filefn.obj \ filesys.obj \ fontcmn.obj \ + fontmap.obj \ framecmn.obj \ fs_inet.obj \ fs_zip.obj \ @@ -306,11 +312,11 @@ COMLIBOBJS1 = \ imaggif.obj \ imagjpeg.obj \ imagpcx.obj \ - imagpng.obj \ - imagpnm.obj \ - intl.obj + imagpng.obj COMLIBOBJS2 = \ + imagpnm.obj \ + intl.obj \ ipcbase.obj \ layout.obj \ lboxcmn.obj \ @@ -319,12 +325,12 @@ COMLIBOBJS2 = \ longlong.obj \ matrix.obj \ memory.obj \ - mimetype.obj \ + menucmn.obj \ + mimecmn.obj \ module.obj \ mstream.obj \ object.obj \ objstrm.obj \ - odbc.obj \ paper.obj \ prntbase.obj \ process.obj \ @@ -341,10 +347,8 @@ COMLIBOBJS2 = \ stream.obj \ string.obj \ tbarbase.obj \ - tbarsmpl.obj \ textcmn.obj \ textfile.obj \ - time.obj \ timercmn.obj \ tokenzr.obj \ txtstrm.obj \ @@ -352,10 +356,10 @@ COMLIBOBJS2 = \ url.obj \ utilscmn.obj \ valgen.obj \ - validate.obj \ - valtext.obj + validate.obj COMLIBOBJS3 = \ + valtext.obj \ variant.obj \ wfstream.obj \ wincmn.obj \ @@ -393,9 +397,12 @@ OS2OBJS = \ ..\os2\$D\filedlg.obj \ ..\os2\$D\font.obj \ ..\os2\$D\fontdlg.obj \ + ..\os2\$D\fontenum.obj \ + ..\os2\$D\fontutil.obj \ ..\os2\$D\frame.obj \ ..\os2\$D\gauge.obj \ ..\os2\$D\gdiobj.obj \ + ..\os2\$D\gdiimage.obj \ ..\os2\$D\gsocket.obj \ ..\os2\$D\helpwin.obj \ ..\os2\$D\icon.obj \ @@ -407,6 +414,7 @@ OS2OBJS = \ ..\os2\$D\menu.obj \ ..\os2\$D\menuitem.obj \ ..\os2\$D\metafile.obj \ + ..\os2\$D\mimetype.obj \ ..\os2\$D\minifram.obj \ ..\os2\$D\msgdlg.obj \ ..\os2\$D\nativdlg.obj \ @@ -468,8 +476,11 @@ OS2LIBOBJS1 = \ filedlg.obj \ font.obj \ fontdlg.obj \ + fontenum.obj \ + fontutil.obj \ frame.obj \ gauge.obj \ + gdiimage.obj \ gdiobj.obj \ gsocket.obj \ helpwin.obj \ @@ -482,12 +493,13 @@ OS2LIBOBJS1 = \ menu.obj \ menuitem.obj \ metafile.obj \ + mimetype.obj + +OS2LIBOBJS2 = \ minifram.obj \ msgdlg.obj \ nativdlg.obj \ - notebook.obj - -OS2LIBOBJS2 = \ + notebook.obj \ ownerdrw.obj \ palette.obj \ pen.obj \ @@ -518,6 +530,7 @@ OS2LIBOBJS2 = \ window.obj HTMLOBJS = \ + ..\html\$D\helpctrl.obj \ ..\html\$D\helpdata.obj \ ..\html\$D\helpfrm.obj \ ..\html\$D\htmlcell.obj \ @@ -537,6 +550,7 @@ HTMLOBJS = \ ..\html\$D\winpars.obj HTMLLIBOBJS = \ + helpctrl.obj \ helpdata.obj \ helpfrm.obj \ htmlcell.obj \ @@ -567,6 +581,14 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D test: $(OS2DIR)\$D\wave.obj test2: ..\common\Debug\config.obj +$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h + icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp + +$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h + icc @<< +$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp +<< + $(COMLIBOBJS1): copy ..\common\$D\appcmn.obj copy ..\common\$D\choiccmn.obj @@ -575,7 +597,7 @@ $(COMLIBOBJS1): copy ..\common\$D\config.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.obj - copy ..\common\$D\date.obj + copy ..\common\$D\datetime.obj copy ..\common\$D\datstrm.obj copy ..\common\$D\db.obj copy ..\common\$D\dbtable.obj @@ -586,6 +608,7 @@ $(COMLIBOBJS1): copy ..\common\$D\docview.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj copy ..\common\$D\ffile.obj @@ -594,6 +617,7 @@ $(COMLIBOBJS1): copy ..\common\$D\filefn.obj copy ..\common\$D\filesys.obj copy ..\common\$D\fontcmn.obj + copy ..\common\$D\fontmap.obj copy ..\common\$D\framecmn.obj copy ..\common\$D\fs_inet.obj copy ..\common\$D\fs_zip.obj @@ -610,10 +634,10 @@ $(COMLIBOBJS1): copy ..\common\$D\imagjpeg.obj copy ..\common\$D\imagpcx.obj copy ..\common\$D\imagpng.obj - copy ..\common\$D\imagpnm.obj - copy ..\common\$D\intl.obj $(COMLIBOBJS2): + copy ..\common\$D\imagpnm.obj + copy ..\common\$D\intl.obj copy ..\common\$D\ipcbase.obj copy ..\common\$D\layout.obj copy ..\common\$D\lboxcmn.obj @@ -622,12 +646,12 @@ $(COMLIBOBJS2): copy ..\common\$D\longlong.obj copy ..\common\$D\matrix.obj copy ..\common\$D\memory.obj - copy ..\common\$D\mimetype.obj + copy ..\common\$D\menucmn.obj + copy ..\common\$D\mimecmn.obj copy ..\common\$D\module.obj copy ..\common\$D\mstream.obj copy ..\common\$D\object.obj copy ..\common\$D\objstrm.obj - copy ..\common\$D\odbc.obj copy ..\common\$D\paper.obj copy ..\common\$D\prntbase.obj copy ..\common\$D\process.obj @@ -644,10 +668,8 @@ $(COMLIBOBJS2): copy ..\common\$D\stream.obj copy ..\common\$D\string.obj copy ..\common\$D\tbarbase.obj - copy ..\common\$D\tbarsmpl.obj copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj - copy ..\common\$D\time.obj copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj copy ..\common\$D\txtstrm.obj @@ -656,9 +678,9 @@ $(COMLIBOBJS2): copy ..\common\$D\utilscmn.obj copy ..\common\$D\valgen.obj copy ..\common\$D\validate.obj - copy ..\common\$D\valtext.obj $(COMLIBOBJS3): + copy ..\common\$D\valtext.obj copy ..\common\$D\variant.obj copy ..\common\$D\wfstream.obj copy ..\common\$D\wincmn.obj @@ -670,6 +692,7 @@ $(COMLIBOBJS3): $(GENLIBOBJS): copy ..\generic\$D\busyinfo.obj + copy ..\generic\$D\calctrl.obj copy ..\generic\$D\caret.obj copy ..\generic\$D\choicdgg.obj copy ..\generic\$D\colrdlgg.obj @@ -685,6 +708,7 @@ $(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 @@ -701,6 +725,7 @@ $(GENLIBOBJS): copy ..\generic\$D\treectrl.obj $(HTMLLIBOBJS): + copy ..\html\$D\helpctrl.obj copy ..\html\$D\helpdata.obj copy ..\html\$D\helpfrm.obj copy ..\html\$D\htmlcell.obj @@ -747,8 +772,11 @@ $(OS2LIBOBJS1): copy ..\os2\$D\filedlg.obj copy ..\os2\$D\font.obj copy ..\os2\$D\fontdlg.obj + copy ..\os2\$D\fontenum.obj + copy ..\os2\$D\fontutil.obj copy ..\os2\$D\frame.obj copy ..\os2\$D\gauge.obj + copy ..\os2\$D\gdiimage.obj copy ..\os2\$D\gdiobj.obj copy ..\os2\$D\gsocket.obj copy ..\os2\$D\helpwin.obj @@ -761,12 +789,13 @@ $(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\minifram.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj copy ..\os2\$D\notebook.obj - -$(OS2LIBOBJS2): copy ..\os2\$D\ownerdrw.obj copy ..\os2\$D\palette.obj copy ..\os2\$D\pen.obj @@ -930,14 +959,6 @@ $(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib !endif -$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h - icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp - -$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h - icc @<< -$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp -<< - # If taking wxWindows from CVS, setup.h doesn't exist yet. $(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\os2\setup.bak