X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fa399c9e241e99132733b09673cbcb76c9f77e1..1fc8878582bcdab2a90b95fb713c4d088a0e2a57:/src/msw/makefile.vc diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 21d52241cf..70b958e5c4 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 16:52, 2000/02/29 +# This file was automatically generated by tmake at 18:13, 2000/09/12 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -27,9 +27,6 @@ LIBTARGET=$(WXLIB) DUMMYOBJ=$D\dummy.obj !endif -# Please set these according to the settings in setup.h, so we can include -# the appropriate libraries in wx.lib - # This one overrides the others, to be consistent with the settings in setup.h MINIMAL_WXWINDOWS_SETUP=0 @@ -37,6 +34,9 @@ PERIPH_LIBS= PERIPH_TARGET= PERIPH_CLEAN_TARGET= +# Set to 0 if not using GLCanvas (only affects DLL build) +USE_GLCANVAS=1 + # These are absolute paths, so that the compiler # generates correct __FILE__ symbols for debugging. # Otherwise you don't be able to double-click on a memory @@ -49,309 +49,318 @@ DOCDIR = $(WXDIR)\docs HTMLDIR = $(WXDIR)\src\html {..\generic}.cpp{..\generic\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << {..\common}.cpp{..\common\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << {..\common}.c{..\common\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS2) /Fo$@ /c /Tc $< << {..\msw}.cpp{..\msw\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << {..\msw}.c{..\msw\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS2) /Fo$@ /c /Tc $< << {..\msw\ole}.cpp{..\msw\ole\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << {..\html}.cpp{..\html\$D}.obj: - cl @<< + cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $< << GENERICOBJS= ..\generic\$D\busyinfo.obj \ - ..\generic\$D\calctrl.obj \ - ..\generic\$D\choicdgg.obj \ - ..\generic\$D\dragimgg.obj \ - ..\generic\$D\grid.obj \ - ..\generic\$D\gridsel.obj \ - ..\generic\$D\laywin.obj \ - ..\generic\$D\logg.obj \ - ..\generic\$D\numdlgg.obj \ - ..\generic\$D\panelg.obj \ - ..\generic\$D\plot.obj \ - ..\generic\$D\progdlgg.obj \ - ..\generic\$D\prop.obj \ - ..\generic\$D\propform.obj \ - ..\generic\$D\proplist.obj \ - ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrolwin.obj \ - ..\generic\$D\splitter.obj \ - ..\generic\$D\statusbr.obj \ - ..\generic\$D\tbarsmpl.obj \ - ..\generic\$D\textdlgg.obj \ - ..\generic\$D\tipdlg.obj \ - ..\generic\$D\treelay.obj \ - ..\generic\$D\wizard.obj + ..\generic\$D\calctrl.obj \ + ..\generic\$D\choicdgg.obj \ + ..\generic\$D\dirctrlg.obj \ + ..\generic\$D\dragimgg.obj \ + ..\generic\$D\grid.obj \ + ..\generic\$D\gridsel.obj \ + ..\generic\$D\laywin.obj \ + ..\generic\$D\logg.obj \ + ..\generic\$D\numdlgg.obj \ + ..\generic\$D\panelg.obj \ + ..\generic\$D\plot.obj \ + ..\generic\$D\progdlgg.obj \ + ..\generic\$D\prop.obj \ + ..\generic\$D\propform.obj \ + ..\generic\$D\proplist.obj \ + ..\generic\$D\sashwin.obj \ + ..\generic\$D\scrolwin.obj \ + ..\generic\$D\splash.obj \ + ..\generic\$D\splitter.obj \ + ..\generic\$D\statusbr.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 # These are generic things that don't need to be compiled on MSW, # but sometimes it's useful to do so for testing purposes. NONESSENTIALOBJS= ..\generic\$D\caret.obj \ - ..\generic\$D\colrdlgg.obj \ - ..\generic\$D\dcpsg.obj \ - ..\generic\$D\dirdlgg.obj \ - ..\generic\$D\filedlgg.obj \ - ..\generic\$D\fontdlgg.obj \ - ..\generic\$D\helpext.obj \ - ..\generic\$D\helphtml.obj \ - ..\generic\$D\helpwxht.obj \ - ..\generic\$D\helpxlp.obj \ - ..\generic\$D\imaglist.obj \ - ..\generic\$D\listctrl.obj \ - ..\generic\$D\msgdlgg.obj \ - ..\generic\$D\notebook.obj \ - ..\generic\$D\printps.obj \ - ..\generic\$D\prntdlgg.obj \ - ..\generic\$D\statline.obj \ - ..\generic\$D\tabg.obj \ - ..\generic\$D\treectrl.obj + ..\generic\$D\colrdlgg.obj \ + ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirdlgg.obj \ + ..\generic\$D\filedlgg.obj \ + ..\generic\$D\fontdlgg.obj \ + ..\generic\$D\helpext.obj \ + ..\generic\$D\helphtml.obj \ + ..\generic\$D\helpwxht.obj \ + ..\generic\$D\helpxlp.obj \ + ..\generic\$D\imaglist.obj \ + ..\generic\$D\listctrl.obj \ + ..\generic\$D\msgdlgg.obj \ + ..\generic\$D\notebook.obj \ + ..\generic\$D\printps.obj \ + ..\generic\$D\prntdlgg.obj \ + ..\generic\$D\statline.obj \ + ..\generic\$D\tabg.obj COMMONOBJS = \ - ..\common\$D\y_tab.obj \ - ..\common\$D\appcmn.obj \ - ..\common\$D\choiccmn.obj \ - ..\common\$D\clipcmn.obj \ - ..\common\$D\cmdline.obj \ - ..\common\$D\cmndata.obj \ - ..\common\$D\config.obj \ - ..\common\$D\ctrlcmn.obj \ - ..\common\$D\ctrlsub.obj \ - ..\common\$D\datetime.obj \ - ..\common\$D\datstrm.obj \ - ..\common\$D\db.obj \ - ..\common\$D\dbtable.obj \ - ..\common\$D\dcbase.obj \ - ..\common\$D\dlgcmn.obj \ - ..\common\$D\dndcmn.obj \ - ..\common\$D\dobjcmn.obj \ - ..\common\$D\docmdi.obj \ - ..\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 \ - ..\common\$D\file.obj \ - ..\common\$D\fileconf.obj \ - ..\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_mem.obj \ - ..\common\$D\fs_zip.obj \ - ..\common\$D\ftp.obj \ - ..\common\$D\gdicmn.obj \ - ..\common\$D\geometry.obj \ - ..\common\$D\gifdecod.obj \ - ..\common\$D\hash.obj \ - ..\common\$D\helpbase.obj \ - ..\common\$D\http.obj \ - ..\common\$D\imagall.obj \ - ..\common\$D\imagbmp.obj \ - ..\common\$D\image.obj \ - ..\common\$D\imaggif.obj \ - ..\common\$D\imagjpeg.obj \ - ..\common\$D\imagpcx.obj \ - ..\common\$D\imagpng.obj \ - ..\common\$D\imagpnm.obj \ - ..\common\$D\imagtiff.obj \ - ..\common\$D\intl.obj \ - ..\common\$D\ipcbase.obj \ - ..\common\$D\layout.obj \ - ..\common\$D\lboxcmn.obj \ - ..\common\$D\list.obj \ - ..\common\$D\log.obj \ - ..\common\$D\longlong.obj \ - ..\common\$D\memory.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 \ - ..\common\$D\protocol.obj \ - ..\common\$D\resource.obj \ - ..\common\$D\sckaddr.obj \ - ..\common\$D\sckfile.obj \ - ..\common\$D\sckipc.obj \ - ..\common\$D\sckstrm.obj \ - ..\common\$D\serbase.obj \ - ..\common\$D\sizer.obj \ - ..\common\$D\socket.obj \ - ..\common\$D\strconv.obj \ - ..\common\$D\stream.obj \ - ..\common\$D\string.obj \ - ..\common\$D\tbarbase.obj \ - ..\common\$D\textcmn.obj \ - ..\common\$D\textfile.obj \ - ..\common\$D\timercmn.obj \ - ..\common\$D\tokenzr.obj \ - ..\common\$D\txtstrm.obj \ - ..\common\$D\unzip.obj \ - ..\common\$D\url.obj \ - ..\common\$D\utilscmn.obj \ - ..\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\zipstrm.obj \ - ..\common\$D\zstream.obj + ..\common\$D\y_tab.obj \ + ..\common\$D\appcmn.obj \ + ..\common\$D\choiccmn.obj \ + ..\common\$D\clipcmn.obj \ + ..\common\$D\cmdline.obj \ + ..\common\$D\cmndata.obj \ + ..\common\$D\config.obj \ + ..\common\$D\cshelp.obj \ + ..\common\$D\ctrlcmn.obj \ + ..\common\$D\ctrlsub.obj \ + ..\common\$D\datetime.obj \ + ..\common\$D\datstrm.obj \ + ..\common\$D\db.obj \ + ..\common\$D\dbtable.obj \ + ..\common\$D\dcbase.obj \ + ..\common\$D\dlgcmn.obj \ + ..\common\$D\dndcmn.obj \ + ..\common\$D\dobjcmn.obj \ + ..\common\$D\docmdi.obj \ + ..\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 \ + ..\common\$D\ffile.obj \ + ..\common\$D\file.obj \ + ..\common\$D\fileconf.obj \ + ..\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_mem.obj \ + ..\common\$D\fs_zip.obj \ + ..\common\$D\ftp.obj \ + ..\common\$D\gdicmn.obj \ + ..\common\$D\geometry.obj \ + ..\common\$D\gifdecod.obj \ + ..\common\$D\hash.obj \ + ..\common\$D\helpbase.obj \ + ..\common\$D\http.obj \ + ..\common\$D\imagall.obj \ + ..\common\$D\imagbmp.obj \ + ..\common\$D\image.obj \ + ..\common\$D\imaggif.obj \ + ..\common\$D\imagjpeg.obj \ + ..\common\$D\imagpcx.obj \ + ..\common\$D\imagpng.obj \ + ..\common\$D\imagpnm.obj \ + ..\common\$D\imagtiff.obj \ + ..\common\$D\intl.obj \ + ..\common\$D\ipcbase.obj \ + ..\common\$D\layout.obj \ + ..\common\$D\lboxcmn.obj \ + ..\common\$D\list.obj \ + ..\common\$D\log.obj \ + ..\common\$D\longlong.obj \ + ..\common\$D\memory.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 \ + ..\common\$D\protocol.obj \ + ..\common\$D\quantize.obj \ + ..\common\$D\resource.obj \ + ..\common\$D\sckaddr.obj \ + ..\common\$D\sckfile.obj \ + ..\common\$D\sckipc.obj \ + ..\common\$D\sckstrm.obj \ + ..\common\$D\serbase.obj \ + ..\common\$D\sizer.obj \ + ..\common\$D\socket.obj \ + ..\common\$D\strconv.obj \ + ..\common\$D\stream.obj \ + ..\common\$D\string.obj \ + ..\common\$D\tbarbase.obj \ + ..\common\$D\textcmn.obj \ + ..\common\$D\textfile.obj \ + ..\common\$D\timercmn.obj \ + ..\common\$D\tokenzr.obj \ + ..\common\$D\treebase.obj \ + ..\common\$D\txtstrm.obj \ + ..\common\$D\unzip.obj \ + ..\common\$D\url.obj \ + ..\common\$D\utilscmn.obj \ + ..\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\zipstrm.obj \ + ..\common\$D\zstream.obj MSWOBJS = ..\msw\$D\accel.obj \ - ..\msw\$D\app.obj \ - ..\msw\ole\$D\automtn.obj \ - ..\msw\$D\bitmap.obj \ - ..\msw\$D\bmpbuttn.obj \ - ..\msw\$D\brush.obj \ - ..\msw\$D\button.obj \ - ..\msw\$D\caret.obj \ - ..\msw\$D\checkbox.obj \ - ..\msw\$D\checklst.obj \ - ..\msw\$D\choice.obj \ - ..\msw\$D\clipbrd.obj \ - ..\msw\$D\colordlg.obj \ - ..\msw\$D\colour.obj \ - ..\msw\$D\combobox.obj \ - ..\msw\$D\control.obj \ - ..\msw\$D\curico.obj \ - ..\msw\$D\cursor.obj \ - ..\msw\$D\data.obj \ - ..\msw\ole\$D\dataobj.obj \ - ..\msw\$D\dc.obj \ - ..\msw\$D\dcclient.obj \ - ..\msw\$D\dcmemory.obj \ - ..\msw\$D\dcprint.obj \ - ..\msw\$D\dcscreen.obj \ - ..\msw\$D\dde.obj \ - ..\msw\$D\dialog.obj \ - ..\msw\$D\dialup.obj \ - ..\msw\$D\dib.obj \ - ..\msw\$D\dibutils.obj \ - ..\msw\$D\dir.obj \ - ..\msw\$D\dirdlg.obj \ - ..\msw\$D\dragimag.obj \ - ..\msw\ole\$D\dropsrc.obj \ - ..\msw\ole\$D\droptgt.obj \ - ..\msw\$D\enhmeta.obj \ - ..\msw\$D\filedlg.obj \ - ..\msw\$D\font.obj \ - ..\msw\$D\fontdlg.obj \ - ..\msw\$D\fontenum.obj \ - ..\msw\$D\fontutil.obj \ - ..\msw\$D\frame.obj \ - ..\msw\$D\gauge95.obj \ - ..\msw\$D\gdiimage.obj \ - ..\msw\$D\gdiobj.obj \ - ..\msw\$D\glcanvas.obj \ - ..\msw\$D\gsocket.obj \ - ..\msw\$D\helpwin.obj \ - ..\msw\$D\icon.obj \ - ..\msw\$D\imaglist.obj \ - ..\msw\$D\joystick.obj \ - ..\msw\$D\listbox.obj \ - ..\msw\$D\listctrl.obj \ - ..\msw\$D\main.obj \ - ..\msw\$D\mdi.obj \ - ..\msw\$D\menu.obj \ - ..\msw\$D\menuitem.obj \ - ..\msw\$D\metafile.obj \ - ..\msw\$D\mimetype.obj \ - ..\msw\$D\minifram.obj \ - ..\msw\$D\msgdlg.obj \ - ..\msw\$D\nativdlg.obj \ - ..\msw\$D\notebook.obj \ - ..\msw\ole\$D\oleutils.obj \ - ..\msw\$D\ownerdrw.obj \ - ..\msw\$D\palette.obj \ - ..\msw\$D\pen.obj \ - ..\msw\$D\penwin.obj \ - ..\msw\$D\printdlg.obj \ - ..\msw\$D\printwin.obj \ - ..\msw\$D\radiobox.obj \ - ..\msw\$D\radiobut.obj \ - ..\msw\$D\regconf.obj \ - ..\msw\$D\region.obj \ - ..\msw\$D\registry.obj \ - ..\msw\$D\scrolbar.obj \ - ..\msw\$D\settings.obj \ - ..\msw\$D\slider95.obj \ - ..\msw\$D\spinbutt.obj \ - ..\msw\$D\spinctrl.obj \ - ..\msw\$D\statbmp.obj \ - ..\msw\$D\statbox.obj \ - ..\msw\$D\statbr95.obj \ - ..\msw\$D\statline.obj \ - ..\msw\$D\stattext.obj \ - ..\msw\$D\tabctrl.obj \ - ..\msw\$D\taskbar.obj \ - ..\msw\$D\tbar95.obj \ - ..\msw\$D\textctrl.obj \ - ..\msw\$D\thread.obj \ - ..\msw\$D\timer.obj \ - ..\msw\$D\tooltip.obj \ - ..\msw\$D\treectrl.obj \ - ..\msw\$D\utils.obj \ - ..\msw\$D\utilsexc.obj \ - ..\msw\ole\$D\uuid.obj \ - ..\msw\$D\wave.obj \ - ..\msw\$D\window.obj \ - ..\msw\$D\xpmhand.obj + ..\msw\$D\app.obj \ + ..\msw\ole\$D\automtn.obj \ + ..\msw\$D\bitmap.obj \ + ..\msw\$D\bmpbuttn.obj \ + ..\msw\$D\brush.obj \ + ..\msw\$D\button.obj \ + ..\msw\$D\caret.obj \ + ..\msw\$D\checkbox.obj \ + ..\msw\$D\checklst.obj \ + ..\msw\$D\choice.obj \ + ..\msw\$D\clipbrd.obj \ + ..\msw\$D\colordlg.obj \ + ..\msw\$D\colour.obj \ + ..\msw\$D\combobox.obj \ + ..\msw\$D\control.obj \ + ..\msw\$D\curico.obj \ + ..\msw\$D\cursor.obj \ + ..\msw\$D\data.obj \ + ..\msw\ole\$D\dataobj.obj \ + ..\msw\$D\dc.obj \ + ..\msw\$D\dcclient.obj \ + ..\msw\$D\dcmemory.obj \ + ..\msw\$D\dcprint.obj \ + ..\msw\$D\dcscreen.obj \ + ..\msw\$D\dde.obj \ + ..\msw\$D\dialog.obj \ + ..\msw\$D\dialup.obj \ + ..\msw\$D\dib.obj \ + ..\msw\$D\dibutils.obj \ + ..\msw\$D\dir.obj \ + ..\msw\$D\dirdlg.obj \ + ..\msw\$D\dragimag.obj \ + ..\msw\ole\$D\dropsrc.obj \ + ..\msw\ole\$D\droptgt.obj \ + ..\msw\$D\enhmeta.obj \ + ..\msw\$D\filedlg.obj \ + ..\msw\$D\font.obj \ + ..\msw\$D\fontdlg.obj \ + ..\msw\$D\fontenum.obj \ + ..\msw\$D\fontutil.obj \ + ..\msw\$D\frame.obj \ + ..\msw\$D\gauge95.obj \ + ..\msw\$D\gdiimage.obj \ + ..\msw\$D\gdiobj.obj \ + ..\msw\$D\glcanvas.obj \ + ..\msw\$D\gsocket.obj \ + ..\msw\$D\gsockmsw.obj \ + ..\msw\$D\helpchm.obj \ + ..\msw\$D\helpwin.obj \ + ..\msw\$D\icon.obj \ + ..\msw\$D\imaglist.obj \ + ..\msw\$D\joystick.obj \ + ..\msw\$D\listbox.obj \ + ..\msw\$D\listctrl.obj \ + ..\msw\$D\main.obj \ + ..\msw\$D\mdi.obj \ + ..\msw\$D\menu.obj \ + ..\msw\$D\menuitem.obj \ + ..\msw\$D\metafile.obj \ + ..\msw\$D\mimetype.obj \ + ..\msw\$D\minifram.obj \ + ..\msw\$D\msgdlg.obj \ + ..\msw\$D\nativdlg.obj \ + ..\msw\$D\notebook.obj \ + ..\msw\ole\$D\oleutils.obj \ + ..\msw\$D\ownerdrw.obj \ + ..\msw\$D\palette.obj \ + ..\msw\$D\pen.obj \ + ..\msw\$D\penwin.obj \ + ..\msw\$D\printdlg.obj \ + ..\msw\$D\printwin.obj \ + ..\msw\$D\radiobox.obj \ + ..\msw\$D\radiobut.obj \ + ..\msw\$D\regconf.obj \ + ..\msw\$D\region.obj \ + ..\msw\$D\registry.obj \ + ..\msw\$D\scrolbar.obj \ + ..\msw\$D\settings.obj \ + ..\msw\$D\slider95.obj \ + ..\msw\$D\spinbutt.obj \ + ..\msw\$D\spinctrl.obj \ + ..\msw\$D\statbmp.obj \ + ..\msw\$D\statbox.obj \ + ..\msw\$D\statbr95.obj \ + ..\msw\$D\statline.obj \ + ..\msw\$D\stattext.obj \ + ..\msw\$D\tabctrl.obj \ + ..\msw\$D\taskbar.obj \ + ..\msw\$D\tbar95.obj \ + ..\msw\$D\textctrl.obj \ + ..\msw\$D\thread.obj \ + ..\msw\$D\timer.obj \ + ..\msw\$D\tooltip.obj \ + ..\msw\$D\treectrl.obj \ + ..\msw\$D\utils.obj \ + ..\msw\$D\utilsexc.obj \ + ..\msw\ole\$D\uuid.obj \ + ..\msw\$D\wave.obj \ + ..\msw\$D\window.obj \ + ..\msw\$D\xpmhand.obj HTMLOBJS = ..\html\$D\helpctrl.obj \ - ..\html\$D\helpdata.obj \ - ..\html\$D\helpfrm.obj \ - ..\html\$D\htmlcell.obj \ - ..\html\$D\htmlfilt.obj \ - ..\html\$D\htmlpars.obj \ - ..\html\$D\htmltag.obj \ - ..\html\$D\htmlwin.obj \ - ..\html\$D\htmprint.obj \ - ..\html\$D\m_dflist.obj \ - ..\html\$D\m_fonts.obj \ - ..\html\$D\m_hline.obj \ - ..\html\$D\m_image.obj \ - ..\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_tables.obj \ - ..\html\$D\winpars.obj + ..\html\$D\helpdata.obj \ + ..\html\$D\helpfrm.obj \ + ..\html\$D\htmlcell.obj \ + ..\html\$D\htmlfilt.obj \ + ..\html\$D\htmlpars.obj \ + ..\html\$D\htmltag.obj \ + ..\html\$D\htmlwin.obj \ + ..\html\$D\htmprint.obj \ + ..\html\$D\m_dflist.obj \ + ..\html\$D\m_fonts.obj \ + ..\html\$D\m_hline.obj \ + ..\html\$D\m_image.obj \ + ..\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_tables.obj \ + ..\html\$D\winpars.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. @@ -359,14 +368,11 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png$(LIBEXT) zlib$(LIBEXT) xpm$(LIBEXT) jpeg$(LIBEXT) tiff$(LIBEXT) $(LIBTARGET) +all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D -test: $(MSWDIR)\$D\wave.obj -test2: ..\common\Debug\config.obj - $D: mkdir $D @@ -421,11 +427,11 @@ pch1: dirs $(DUMMYOBJ) ### Static library $(WXDIR)\lib\$(WXLIBNAME).lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS) - -erase $(LIBTARGET) - $(implib) @<< + -erase $(LIBTARGET) + $(implib) @<< -out:$@ -machine:$(CPU) -$(OBJECTS) $(PERIPH_LIBS) +$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS) << !else @@ -440,16 +446,26 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) -out:$(WXDIR)\lib\$(WXLIBNAME).lib << +!if "$(USE_GLCANVAS)" == "1" +GL_LIBS=opengl32.lib glu32.lib +GL_LIBS_DELAY=/delayload:opengl32.dll +!endif + # Update the dynamic link library $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\$(WXLIBNAME).dll - $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib + $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib + delayimp.lib + /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll + /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll + /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY) << !endif +# /delayload:winmm.dll # Removed because it can cause a crash for some people ######################################################## # Windows-specific objects @@ -463,60 +479,67 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp << # Compile certain files with no optimization (some files cause a -# compiler crash for buggy versions of VC++, e.g. 4.0) +# compiler crash for buggy versions of VC++, e.g. 4.0). +# Don't forget to put FINAL=1 on the command line. noopt: - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp << - cl @<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp +<< + cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp << - cl @<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp +<< + cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp << - cl @<< + cl @<< $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp << @@ -541,7 +564,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ ..\common\lex_yy.c: ..\common\doslex.c copy "..\common"\doslex.c "..\common"\lex_yy.c -$(OBJECTS): $(WXDIR)/include/wx/setup.h +$(OBJECTS): $(WXDIR)/include/wx/setup.h ..\common\$D\unzip.obj: ..\common\unzip.c cl @<< @@ -605,14 +628,17 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff - -erase $(LIBTARGET) - -erase $(WXDIR)\lib\$(WXLIBNAME).pdb +cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk + + +clean: $(PERIPH_CLEAN_TARGET) + -erase $(LIBTARGET) + -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase *.pdb -erase *.sbr -erase $(WXLIBNAME).pch @@ -622,7 +648,7 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti -erase $(COMMDIR)\$D\*.obj -erase $(COMMDIR)\$D\*.pdb -erase $(COMMDIR)\$D\*.sbr - -erase $(COMMDIR)\\y_tab.c + -erase $(COMMDIR)\y_tab.c -erase $(COMMDIR)\lex_yy.c -erase $(MSWDIR)\$D\*.obj -erase $(MSWDIR)\$D\*.sbr @@ -639,10 +665,9 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti -rmdir ..\common\$(D) -rmdir ..\html\$(D) -cleanall: clean # Making documents -docs: allhlp allhtml allpdfrtf +docs: allhlp allhtml allpdfrtf htb htmlhelp alldocs: docs hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp @@ -650,12 +675,13 @@ refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf -html: wxhtml -wxhtml: $(DOCDIR)\html\wx\wx.htm -htmlhelp: $(DOCDIR)\html\wx\wx.chm +html: wxhtml +htb: $(DOCDIR)\htb\wx.htb +wxhtml: $(DOCDIR)\html\wx\wx.htm +htmlhelp: $(DOCDIR)\htmlhelp\wx.chm ps: wxps referencps -wxps: $(WXDIR)\docs\ps\wx.ps -referencps: $(WXDIR)\docs\ps\referenc.ps +wxps: $(WXDIR)\docs\ps\wx.ps +referencps: $(WXDIR)\docs\ps\referenc.ps allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src @@ -724,6 +750,8 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w cd $(DOCDIR)/latex/wx -erase wx.ph hc wx + -erase $(DOCDIR)\winhelp\wx.hlp + -erase $(DOCDIR)\winhelp\wx.cnt move wx.hlp $(DOCDIR)\winhelp\wx.hlp move wx.cnt $(DOCDIR)\winhelp\wx.cnt cd $(THISDIR) @@ -763,6 +791,7 @@ $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex cd $(DOCDIR)\latex\wx -mkdir $(DOCDIR)\html\wx + copy *.gif $(DOCDIR)\html\wx -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html -erase $(DOCDIR)\html\wx\*.con -erase $(DOCDIR)\html\wx\*.ref @@ -770,13 +799,16 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) -$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp - cd $(DOCDIR)\html\wx - -hhc wx.hhp - cd $(THISDIR) +$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp + cd $(DOCDIR)\html\wx + -hhc wx.hhp + -mkdir ..\..\htmlhelp + -erase $(DOCDIR)\htmlhelp\wx.chm + move wx.chm ..\..\htmlhelp + cd $(THISDIR) -$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex - cd $(WXDIR)\docs\latex\wx +$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex + cd $(WXDIR)\docs\latex\wx -latex manual -latex manual -makeindx manual @@ -785,14 +817,14 @@ $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/la -latex manual cd $(THISDIR) -$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi - cd $(WXDIR)\docs\latex\wx +$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi + cd $(WXDIR)\docs\latex\wx -dvips32 -o wx.ps manual move wx.ps $(WXDIR)\docs\ps\wx.ps cd $(THISDIR) -$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex - cd $(WXDIR)\docs\latex\wx +$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex + cd $(WXDIR)\docs\latex\wx -latex referenc -latex referenc -makeindx referenc @@ -801,18 +833,37 @@ $(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR) -latex referenc cd $(THISDIR) -$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi - cd $(WXDIR)\docs\latex\wx +$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi + cd $(WXDIR)\docs\latex\wx -dvips32 -o referenc.ps referenc move referenc.ps $(WXDIR)\docs\ps\referenc.ps cd $(THISDIR) +# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk +# files, renamed to htb. +# This can then be used with e.g. helpview. +# Optionally, a cached version of the .hhp file can be generated with hhp2cached. +$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm + cd $(WXDIR)\docs\html\wx + -erase /Y wx.zip wx.htb + zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk + -mkdir $(DOCDIR)\htb + move wx.zip $(DOCDIR)\htb\wx.htb + cd $(THISDIR) + # In order to force document reprocessing touchmanual: -touch $(WXDIR)\docs\latex\wx\manual.tex updatedocs: touchmanual alldocs +cleandocs: + -erase /Y $(DOCDIR)\html\wx\wx.htm + -erase /Y $(DOCDIR)\pdf\wx.rtf + -erase /Y $(DOCDIR)\latex\wx\wx.rtf + -erase /Y $(DOCDIR)\htmlhelp\wx.chm + -erase /Y $(DOCDIR)\htb\wx.htb + # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the # Office StartUp folder, and PDFMaker should be installed. updatepdf: # touchmanual pdfrtf @@ -821,7 +872,7 @@ updatepdf: # touchmanual pdfrtf MFTYPE=vc makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t - cd $(WXWIN)\distrib\msw\tmake - tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) - copy makefile.$(MFTYPE) $(WXWIN)\src\msw + cd $(WXWIN)\distrib\msw\tmake + tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) + copy makefile.$(MFTYPE) $(WXWIN)\src\msw