X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d853016702f3d0a987ad73884f9871f7033aaa6c..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/makefile.va?ds=sidebyside diff --git a/src/os2/makefile.va b/src/os2/makefile.va index bbe82e3a5e..6b662e3db8 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -25,6 +25,7 @@ LIBTARGET=$(WXLIB) COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib +COMTEMPTGT4=$(WXDIR)\lib\wxcom4.lib GENTEMPTGT=$(WXDIR)\lib\wxgen.lib NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib @@ -100,22 +101,23 @@ GENERICOBJS= \ ..\generic\$D\caret.obj \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ + ..\generic\$D\dcbuffer.obj \ ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirdlgg.obj \ + ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ - ..\generic\$D\fontdlgg.obj \ + ..\generic\$D\fdrepdlg.obj \ ..\generic\$D\grid.obj \ + ..\generic\$D\gridctrl.obj \ ..\generic\$D\gridsel.obj \ ..\generic\$D\helpext.obj \ ..\generic\$D\helphtml.obj \ - ..\generic\$D\helpwxht.obj \ - ..\generic\$D\helpxlp.obj \ ..\generic\$D\imaglist.obj \ ..\generic\$D\laywin.obj \ - ..\generic\$D\listctrl.obj \ ..\generic\$D\logg.obj \ + ..\generic\$D\mdig.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,15 +125,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\treectrl.obj \ - ..\generic\$D\treelay.obj \ + ..\generic\$D\tipwin.obj \ ..\generic\$D\wizard.obj # ..\generic\$D\gridg.obj \ @@ -143,22 +145,23 @@ GENLIBOBJS= \ caret.obj \ choicdgg.obj \ colrdlgg.obj \ + dcbuffer.obj \ dcpsg.obj \ + dirdlgg.obj \ + dirctrlg.obj \ dragimgg.obj \ - fontdlgg.obj \ + fdrepdlg.obj \ grid.obj \ + gridctrl.obj \ gridsel.obj \ helpext.obj \ helphtml.obj \ - helpwxht.obj \ - helpxlp.obj \ imaglist.obj \ laywin.obj \ - listctrl.obj \ logg.obj \ + mdig.obj \ numdlgg.obj \ panelg.obj \ - plot.obj \ printps.obj \ prntdlgg.obj \ progdlgg.obj \ @@ -166,15 +169,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 \ - treectrl.obj \ - treelay.obj \ + tipwin.obj \ wizard.obj # These are generic things that don't need to be compiled on PM, @@ -183,36 +186,46 @@ NONESSENTIALOBJS= \ ..\generic\$D\msgdlgg.obj COMMONOBJS = \ + ..\common\$D\accesscmn.obj \ + ..\common\$D\artprov.obj \ + ..\common\$D\artstd.obj \ ..\common\$D\appcmn.obj \ ..\common\$D\choiccmn.obj \ ..\common\$D\clipcmn.obj \ + ..\common\$D\clntdata.obj \ ..\common\$D\cmdline.obj \ ..\common\$D\cmndata.obj \ + ..\common\$D\cmdproc.obj \ ..\common\$D\config.obj \ + ..\common\$D\containr.obj \ + ..\common\$D\cshelp.obj \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ + ..\common\$D\datacmn.obj \ ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ -!if "$(WXMAKINGDLL)" != "1" -# don't have an ODBC database - ..\common\$D\db.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 \ ..\common\$D\docmdi.obj \ ..\common\$D\docview.obj \ + ..\common\$D\dpycmn.obj \ + ..\common\$D\dseldlg.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\dynload.obj \ + ..\common\$D\effects.obj \ ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ + ..\common\$D\fddlgcmn.obj \ ..\common\$D\ffile.obj \ ..\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,21 +234,27 @@ 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 \ ..\common\$D\hash.obj \ + ..\common\$D\hashmap.obj \ ..\common\$D\helpbase.obj \ ..\common\$D\http.obj \ + ..\common\$D\iconbndl.obj \ ..\common\$D\imagall.obj \ ..\common\$D\imagbmp.obj \ ..\common\$D\image.obj \ + ..\common\$D\imagfill.obj \ ..\common\$D\imaggif.obj \ + ..\common\$D\imagiff.obj \ ..\common\$D\imagjpeg.obj \ ..\common\$D\imagpcx.obj \ ..\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 \ @@ -248,33 +267,39 @@ COMMONOBJS = \ ..\common\$D\menucmn.obj \ ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ + ..\common\$D\msgout.obj \ ..\common\$D\mstream.obj \ + ..\common\$D\nbkbase.obj \ ..\common\$D\object.obj \ - ..\common\$D\objstrm.obj \ -!if "$(WXMAKINGDLL)" != "1" -# don't have an ODBC database - ..\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\resource.obj \ + ..\common\$D\quantize.obj \ + ..\common\$D\radiocmn.obj \ + ..\common\$D\regex.obj \ + ..\common\$D\rgncmn.obj \ ..\common\$D\sckaddr.obj \ ..\common\$D\sckfile.obj \ ..\common\$D\sckipc.obj \ ..\common\$D\sckstrm.obj \ - ..\common\$D\serbase.obj \ + ..\common\$D\settcmn.obj \ ..\common\$D\sizer.obj \ ..\common\$D\socket.obj \ + ..\common\$D\statbar.obj \ ..\common\$D\strconv.obj \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ + ..\common\$D\sysopt.obj \ ..\common\$D\tbarbase.obj \ + ..\common\$D\textbuf.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ + ..\common\$D\toplvcmn.obj \ + ..\common\$D\treebase.obj \ ..\common\$D\txtstrm.obj \ ..\common\$D\unzip.obj \ ..\common\$D\url.obj \ @@ -282,68 +307,85 @@ COMMONOBJS = \ ..\common\$D\valgen.obj \ ..\common\$D\validate.obj \ ..\common\$D\valtext.obj \ - ..\common\$D\variant.obj \ ..\common\$D\wfstream.obj \ ..\common\$D\wincmn.obj \ ..\common\$D\wxchar.obj \ - ..\common\$D\wxexpr.obj \ - ..\common\$D\y_tab.obj \ + ..\common\$D\xpmdecod.obj \ ..\common\$D\zipstrm.obj \ ..\common\$D\zstream.obj COMLIBOBJS1 = \ + accesscmn.obj \ + artprov.obj \ + artstd.obj \ appcmn.obj \ choiccmn.obj \ clipcmn.obj \ + clntdata.obj \ cmdline.obj \ cmndata.obj \ + cmdproc.obj \ config.obj \ + containr.obj \ + cshelp.obj \ ctrlcmn.obj \ ctrlsub.obj \ + datacmn.obj \ datetime.obj \ datstrm.obj \ - db.obj \ - dbtable.obj \ dcbase.obj \ + dircmn.obj \ dndcmn.obj \ dlgcmn.obj \ dobjcmn.obj \ docmdi.obj \ docview.obj \ + dseldlg.obj \ + dpycmn.obj \ dynarray.obj \ dynlib.obj \ + dynload.obj \ + effects.obj \ encconv.obj \ event.obj \ extended.obj \ + fddlgcmn.obj \ ffile.obj \ file.obj \ fileconf.obj \ filefn.obj \ + filename.obj \ filesys.obj \ fontcmn.obj \ fontmap.obj \ + +COMLIBOBJS2 = \ framecmn.obj \ fs_inet.obj \ fs_mem.obj \ fs_zip.obj \ ftp.obj \ + gaugecmn.obj \ gdicmn.obj \ geometry.obj \ gifdecod.obj \ hash.obj \ + hashmap.obj \ helpbase.obj \ http.obj \ + iconbndl.obj \ imagall.obj \ imagbmp.obj \ - image.obj - -COMLIBOBJS2 = \ + image.obj \ + imagfill.obj \ imaggif.obj \ + imagiff.obj \ imagjpeg.obj \ imagpcx.obj \ imagpng.obj \ imagpnm.obj \ imagtiff.obj \ + imagxpm.obj \ intl.obj \ ipcbase.obj \ layout.obj \ @@ -356,32 +398,41 @@ COMLIBOBJS2 = \ menucmn.obj \ mimecmn.obj \ module.obj \ + msgout.obj \ mstream.obj \ - object.obj \ - objstrm.obj \ - odbc.obj \ + nbkbase.obj \ + object.obj + +COMLIBOBJS3 = \ paper.obj \ + popupcmn.obj \ prntbase.obj \ process.obj \ protocol.obj \ - resource.obj \ + quantize.obj \ + radiocmn.obj \ + regex.obj \ + rgncmn.obj \ sckaddr.obj \ sckfile.obj \ sckipc.obj \ sckstrm.obj \ - serbase.obj \ + settcmn.obj \ sizer.obj \ socket.obj \ + statbar.obj \ strconv.obj \ stream.obj \ string.obj \ + sysopt.obj \ tbarbase.obj \ + textbuf.obj \ textcmn.obj \ textfile.obj \ timercmn.obj \ - tokenzr.obj - -COMLIBOBJS3 = \ + tokenzr.obj \ + toplvcmn.obj \ + treebase.obj \ txtstrm.obj \ unzip.obj \ url.obj \ @@ -389,12 +440,12 @@ COMLIBOBJS3 = \ valgen.obj \ validate.obj \ valtext.obj \ - variant.obj \ wfstream.obj \ wincmn.obj \ wxchar.obj \ - wxexpr.obj \ - y_tab.obj \ + xpmdecod.obj + +COMLIBOBJS4 = \ zipstrm.obj \ zstream.obj @@ -421,7 +472,7 @@ OS2OBJS = \ ..\os2\$D\dcprint.obj \ ..\os2\$D\dcscreen.obj \ ..\os2\$D\dialog.obj \ - ..\os2\$D\dirdlg.obj \ + ..\os2\$D\dir.obj \ ..\os2\$D\dnd.obj \ ..\os2\$D\filedlg.obj \ ..\os2\$D\font.obj \ @@ -430,28 +481,28 @@ 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 \ ..\os2\$D\joystick.obj \ ..\os2\$D\listbox.obj \ + ..\os2\$D\listctrl.obj \ ..\os2\$D\main.obj \ - ..\os2\$D\mdi.obj \ ..\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 \ ..\os2\$D\notebook.obj \ ..\os2\$D\ownerdrw.obj \ ..\os2\$D\palette.obj \ ..\os2\$D\pen.obj \ - ..\os2\$D\pnghand.obj \ + ..\os2\$D\popupwin.obj \ ..\os2\$D\print.obj \ ..\os2\$D\radiobox.obj \ ..\os2\$D\radiobut.obj \ @@ -466,12 +517,13 @@ OS2OBJS = \ ..\os2\$D\statline.obj \ ..\os2\$D\stattext.obj \ ..\os2\$D\tabctrl.obj \ - ..\os2\$D\taskbar.obj \ ..\os2\$D\textctrl.obj \ ..\os2\$D\thread.obj \ ..\os2\$D\timer.obj \ ..\os2\$D\toolbar.obj \ ..\os2\$D\tooltip.obj \ + ..\os2\$D\toplevel.obj \ + ..\os2\$D\treectrl.obj \ ..\os2\$D\utils.obj \ ..\os2\$D\utilsexc.obj \ ..\os2\$D\wave.obj \ @@ -500,7 +552,7 @@ OS2LIBOBJS1 = \ dcprint.obj \ dcscreen.obj \ dialog.obj \ - dirdlg.obj \ + dir.obj \ dnd.obj \ filedlg.obj \ font.obj \ @@ -512,27 +564,27 @@ OS2LIBOBJS1 = \ gdiimage.obj \ gdiobj.obj \ gsocket.obj \ + gsockpm.obj \ helpwin.obj \ icon.obj \ iniconf.obj \ joystick.obj \ listbox.obj \ + listctrl.obj \ main.obj \ - mdi.obj \ menu.obj \ menuitem.obj \ - metafile.obj \ - mimetype.obj + metafile.obj OS2LIBOBJS2 = \ - minifram.obj \ + mimetype.obj \ msgdlg.obj \ nativdlg.obj \ notebook.obj \ ownerdrw.obj \ palette.obj \ pen.obj \ - pnghand.obj \ + popupwin.obj \ print.obj \ radiobox.obj \ radiobut.obj \ @@ -547,12 +599,13 @@ OS2LIBOBJS2 = \ stattext.obj \ statline.obj \ tabctrl.obj \ - taskbar.obj \ textctrl.obj \ thread.obj \ timer.obj \ toolbar.obj \ tooltip.obj \ + toplevel.obj \ + treectrl.obj \ utils.obj \ utilsexc.obj \ wave.obj \ @@ -575,8 +628,8 @@ HTMLOBJS = \ ..\html\$D\m_layout.obj \ ..\html\$D\m_links.obj \ ..\html\$D\m_list.obj \ - ..\html\$D\m_meta.obj \ ..\html\$D\m_pre.obj \ + ..\html\$D\m_style.obj \ ..\html\$D\m_tables.obj \ ..\html\$D\winpars.obj @@ -597,8 +650,8 @@ HTMLLIBOBJS = \ m_layout.obj \ m_links.obj \ m_list.obj \ - m_meta.obj \ m_pre.obj \ + m_style.obj \ m_tables.obj \ winpars.obj @@ -606,7 +659,7 @@ HTMLLIBOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) # Normal, static library -all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET) +all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg tiff $(LIBTARGET) dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D @@ -614,6 +667,13 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D test: $(OS2DIR)\$D\wave.obj test2: ..\common\Debug\config.obj +# 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\setup0.h "$(WXDIR)"\include\wx\os2\setup.h + +$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h + copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h + $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 @@ -621,58 +681,77 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp $(COMLIBOBJS1): + copy ..\common\$D\accesscmn.obj + copy ..\common\$D\artprov.obj + copy ..\common\$D\artstd.obj copy ..\common\$D\appcmn.obj copy ..\common\$D\choiccmn.obj copy ..\common\$D\clipcmn.obj + copy ..\common\$D\clntdata.obj copy ..\common\$D\cmdline.obj copy ..\common\$D\cmndata.obj + copy ..\common\$D\cmdproc.obj copy ..\common\$D\config.obj + copy ..\common\$D\containr.obj + copy ..\common\$D\cshelp.obj copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlsub.obj + copy ..\common\$D\datacmn.obj copy ..\common\$D\datetime.obj copy ..\common\$D\datstrm.obj - copy ..\common\$D\db.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\dpycmn.obj + copy ..\common\$D\dseldlg.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\dynload.obj + copy ..\common\$D\effects.obj copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj + copy ..\common\$D\fddlgcmn.obj copy ..\common\$D\ffile.obj 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 + +$(COMLIBOBJS2): copy ..\common\$D\framecmn.obj copy ..\common\$D\fs_inet.obj 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 copy ..\common\$D\gifdecod.obj copy ..\common\$D\hash.obj + copy ..\common\$D\hashmap.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj + copy ..\common\$D\iconbndl.obj copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj - -$(COMLIBOBJS2): + copy ..\common\$D\imagfill.obj copy ..\common\$D\imaggif.obj + copy ..\common\$D\imagiff.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 @@ -685,32 +764,41 @@ $(COMLIBOBJS2): copy ..\common\$D\menucmn.obj copy ..\common\$D\mimecmn.obj copy ..\common\$D\module.obj + copy ..\common\$D\msgout.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 + +$(COMLIBOBJS3): 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\resource.obj + copy ..\common\$D\quantize.obj + copy ..\common\$D\radiocmn.obj + copy ..\common\$D\regex.obj + copy ..\common\$D\rgncmn.obj copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckfile.obj copy ..\common\$D\sckipc.obj copy ..\common\$D\sckstrm.obj - copy ..\common\$D\serbase.obj + copy ..\common\$D\settcmn.obj copy ..\common\$D\sizer.obj copy ..\common\$D\socket.obj + copy ..\common\$D\statbar.obj copy ..\common\$D\strconv.obj copy ..\common\$D\stream.obj copy ..\common\$D\string.obj + copy ..\common\$D\sysopt.obj copy ..\common\$D\tbarbase.obj + copy ..\common\$D\textbuf.obj copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj - -$(COMLIBOBJS3): + copy ..\common\$D\toplvcmn.obj + copy ..\common\$D\treebase.obj copy ..\common\$D\txtstrm.obj copy ..\common\$D\unzip.obj copy ..\common\$D\url.obj @@ -718,12 +806,12 @@ $(COMLIBOBJS3): copy ..\common\$D\valgen.obj copy ..\common\$D\validate.obj copy ..\common\$D\valtext.obj - copy ..\common\$D\variant.obj copy ..\common\$D\wfstream.obj copy ..\common\$D\wincmn.obj copy ..\common\$D\wxchar.obj - copy ..\common\$D\wxexpr.obj - copy ..\common\$D\y_tab.obj + copy ..\common\$D\xpmdecod.obj + +$(COMLIBOBJS4): copy ..\common\$D\zipstrm.obj copy ..\common\$D\zstream.obj @@ -734,21 +822,22 @@ $(GENLIBOBJS): copy ..\generic\$D\choicdgg.obj copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dragimgg.obj + copy ..\generic\$D\dcbuffer.obj copy ..\generic\$D\dcpsg.obj - copy ..\generic\$D\fontdlgg.obj + copy ..\generic\$D\dirdlgg.obj + copy ..\generic\$D\dirctrlg.obj + copy ..\generic\$D\fdrepdlg.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 - copy ..\generic\$D\helpwxht.obj - copy ..\generic\$D\helpxlp.obj copy ..\generic\$D\imaglist.obj copy ..\generic\$D\laywin.obj - copy ..\generic\$D\listctrl.obj copy ..\generic\$D\logg.obj + copy ..\generic\$D\mdig.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 @@ -756,15 +845,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\treectrl.obj - copy ..\generic\$D\treelay.obj + copy ..\generic\$D\tipwin.obj copy ..\generic\$D\wizard.obj $(HTMLLIBOBJS): @@ -784,8 +873,8 @@ $(HTMLLIBOBJS): copy ..\html\$D\m_layout.obj copy ..\html\$D\m_links.obj copy ..\html\$D\m_list.obj - copy ..\html\$D\m_meta.obj copy ..\html\$D\m_pre.obj + copy ..\html\$D\m_style.obj copy ..\html\$D\m_tables.obj copy ..\html\$D\winpars.obj @@ -812,7 +901,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\dcprint.obj copy ..\os2\$D\dcscreen.obj copy ..\os2\$D\dialog.obj - copy ..\os2\$D\dirdlg.obj + copy ..\os2\$D\dir.obj copy ..\os2\$D\dnd.obj copy ..\os2\$D\filedlg.obj copy ..\os2\$D\font.obj @@ -824,27 +913,27 @@ $(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 copy ..\os2\$D\joystick.obj copy ..\os2\$D\listbox.obj + copy ..\os2\$D\listctrl.obj copy ..\os2\$D\main.obj - 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\minifram.obj + copy ..\os2\$D\mimetype.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj copy ..\os2\$D\notebook.obj copy ..\os2\$D\ownerdrw.obj copy ..\os2\$D\palette.obj copy ..\os2\$D\pen.obj - copy ..\os2\$D\pnghand.obj + copy ..\os2\$D\popupwin.obj copy ..\os2\$D\print.obj copy ..\os2\$D\radiobox.obj copy ..\os2\$D\radiobut.obj @@ -859,12 +948,13 @@ $(OS2LIBOBJS2): copy ..\os2\$D\statline.obj copy ..\os2\$D\stattext.obj copy ..\os2\$D\tabctrl.obj - copy ..\os2\$D\taskbar.obj copy ..\os2\$D\textctrl.obj copy ..\os2\$D\thread.obj copy ..\os2\$D\timer.obj copy ..\os2\$D\toolbar.obj copy ..\os2\$D\tooltip.obj + copy ..\os2\$D\toplevel.obj + copy ..\os2\$D\treectrl.obj copy ..\os2\$D\utils.obj copy ..\os2\$D\utilsexc.obj copy ..\os2\$D\wave.obj @@ -906,57 +996,64 @@ 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\wxcom4.lib: $(COMLIBOBJS4) + -touch $(WXDIR)\lib\wxcom4.lib + -del $(WXDIR)\lib\wxcom4.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) $@ @<< $**; << @@ -967,20 +1064,22 @@ $(WXDIR)\lib\wx.lib: \ $(COMTEMPTGT1) \ $(COMTEMPTGT2) \ $(COMTEMPTGT3) \ + $(COMTEMPTGT4) \ $(GENTEMPTGT) \ $(HTMLTEMPTGT) \ $(NONESTEMPTGT) \ $(OS2TEMPTGT1) \ $(OS2TEMPTGT2) \ $(PERIPH_LIBS) - touch $(LIBTARGET) - del $(LIBTARGET) + -touch $(LIBTARGET) + -del $(LIBTARGET) ilib $(LIBFLAGS) $@ @<< $**; << del $(COMTEMPTGT1) del $(COMTEMPTGT2) del $(COMTEMPTGT3) + del $(COMTEMPTGT4) del $(GENTEMPTGT) del $(HTMLTEMPTGT) del $(NONESTEMPTGT) @@ -989,44 +1088,24 @@ $(WXDIR)\lib\wx.lib: \ !else -# Update the import library -$(WXDIR)\lib\wx214.lib: $(OBJECTS) - implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def - # Update the dynamic link library -$(WXDIR)\lib\wx214.dll: $(OBJECTS) +$(WXDIR)\lib\wx25.dll: $(OBJECTS) icc @<< /B" $(LINKFLAGS)" /Fe$@ $(LIBS) $(DUMMYOBJ) $(OBJECTS) - $(WXDIR)\lib\wx214.def + $(WXDIR)\src\os2\wx25.def << - implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def + implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def !endif -# 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 - copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h - ..\common\$D\extended.obj: ..\common\extended.c icc @<< $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c << -..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c - icc @<< -$(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@ ..\common\y_tab.c -<< - -..\common\y_tab.c: ..\common\dosyacc.c - copy "..\common"\dosyacc.c "..\common"\y_tab.c - -..\common\lex_yy.c: ..\common\doslex.c - copy "..\common"\doslex.c "..\common"\lex_yy.c - $(OBJECTS): $(WXDIR)/include/wx/setup.h ..\common\$D\unzip.obj: ..\common\unzip.c @@ -1064,16 +1143,6 @@ clean_jpeg: nmake -f makefile.va clean cd $(WXDIR)\src\os2 -xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) - cd $(WXDIR)\src\os2 - -clean_xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.va clean - cd $(WXDIR)\src\os2 - tiff: cd $(WXDIR)\src\tiff nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) @@ -1084,21 +1153,19 @@ clean_tiff: nmake -f makefile.va clean cd $(WXDIR)\src\os2 -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff erase /N $(GENDIR)\$D\*.obj erase /N $(COMMDIR)\$D\*.obj erase /N $(HTMLDIR)\$D\*.obj erase /N $(OS2DIR)\$D\*.obj - erase /N $(COMMDIR)\y_tab.c - erase /N $(COMMDIR)\lex_yy.c rd $(D) rd ..\generic\$D rd ..\common\$D rd ..\html\$D rd ..\os2\$D - del $(LIBTARGET) + del ..\lib\wx.lib !if "$(WXMAKINGDLL)" == "1" - erase /N ..\..\lib\wx214.lib + del ..\lib\wx25.lib !endif cleanall: clean