]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.vc
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
don't use deprecated symbols
[wxWidgets.git] / src / msw / makefile.vc
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 297b4118c6e0e14dc9c288d0eae87c43e10f14a0..500d68191de09f21d81a35b84b061372565c0dea 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -21,10 +21,8 @@ THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
-DUMMYOBJ=$D\dummydll.obj
 !else
 LIBTARGET=$(WXLIB)
 !else
 LIBTARGET=$(WXLIB)
-DUMMYOBJ=$D\dummy.obj
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
@@ -37,6 +35,9 @@ PERIPH_CLEAN_TARGET=
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
+# Set to 1 if you are using MSVC 5
+USE_MSVC_5=0
+
 # 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
 # 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
@@ -47,338 +48,386 @@ OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 MSWDIR=$(WXDIR)\src\msw
 DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
+JPEGDIR = $(WXDIR)\src\jpeg
+TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
 
 
-{..\generic}.cpp{..\generic\$D}.obj:
+{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-{..\common}.cpp{..\common\$D}.obj:
+{$(COMMDIR)}.cpp{$(COMMDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-{..\common}.c{..\common\$D}.obj:
+{$(COMMDIR)}.c{$(COMMDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
        cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
-{..\msw}.cpp{..\msw\$D}.obj:
+{$(MSWDIR)}.cpp{$(MSWDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-{..\msw}.c{..\msw\$D}.obj:
+{$(MSWDIR)}.c{$(MSWDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
        cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
-{..\msw\ole}.cpp{..\msw\ole\$D}.obj:
+{$(OLEDIR)}.cpp{$(OLEDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-{..\html}.cpp{..\html\$D}.obj:
+{$(HTMLDIR)}.cpp{$(HTMLDIR)\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-GENERICOBJS= ..\generic\$D\busyinfo.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\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
+GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
+               $(GENDIR)\$D\calctrl.obj \
+               $(GENDIR)\$D\choicdgg.obj \
+               $(GENDIR)\$D\dcbuffer.obj \
+               $(GENDIR)\$D\dcpsg.obj \
+               $(GENDIR)\$D\dirctrlg.obj \
+               $(GENDIR)\$D\dragimgg.obj \
+               $(GENDIR)\$D\grid.obj \
+               $(GENDIR)\$D\gridctrl.obj \
+               $(GENDIR)\$D\gridsel.obj \
+               $(GENDIR)\$D\laywin.obj \
+               $(GENDIR)\$D\logg.obj \
+               $(GENDIR)\$D\numdlgg.obj \
+               $(GENDIR)\$D\panelg.obj \
+               $(GENDIR)\$D\progdlgg.obj \
+               $(GENDIR)\$D\sashwin.obj \
+               $(GENDIR)\$D\scrlwing.obj \
+               $(GENDIR)\$D\selstore.obj \
+               $(GENDIR)\$D\spinctlg.obj \
+               $(GENDIR)\$D\splash.obj \
+               $(GENDIR)\$D\splitter.obj \
+               $(GENDIR)\$D\statusbr.obj \
+               $(GENDIR)\$D\tbarsmpl.obj \
+               $(GENDIR)\$D\textdlgg.obj \
+               $(GENDIR)\$D\tipdlg.obj \
+               $(GENDIR)\$D\tipwin.obj \
+               $(GENDIR)\$D\treectlg.obj \
+               $(GENDIR)\$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.
 
 # 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
+NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
+               $(GENDIR)\$D\dirdlgg.obj \
+               $(GENDIR)\$D\filedlgg.obj \
+               $(GENDIR)\$D\fontdlgg.obj \
+               $(GENDIR)\$D\helpext.obj \
+               $(GENDIR)\$D\imaglist.obj \
+               $(GENDIR)\$D\listctrl.obj \
+               $(GENDIR)\$D\mdig.obj \
+               $(GENDIR)\$D\msgdlgg.obj \
+               $(GENDIR)\$D\notebook.obj \
+               $(GENDIR)\$D\tabg.obj
 
 COMMONOBJS = \
 
 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\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\filename.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\matrix.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\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\tglbtn.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
+               $(COMMDIR)\$D\accesscmn.obj \
+               $(COMMDIR)\$D\appbase.obj \
+               $(COMMDIR)\$D\appcmn.obj \
+               $(COMMDIR)\$D\artprov.obj \
+               $(COMMDIR)\$D\artstd.obj \
+               $(COMMDIR)\$D\choiccmn.obj \
+               $(COMMDIR)\$D\clipcmn.obj \
+               $(COMMDIR)\$D\clntdata.obj \
+               $(COMMDIR)\$D\cmdline.obj \
+               $(COMMDIR)\$D\cmdproc.obj \
+               $(COMMDIR)\$D\cmndata.obj \
+               $(COMMDIR)\$D\config.obj \
+               $(COMMDIR)\$D\containr.obj \
+               $(COMMDIR)\$D\cshelp.obj \
+               $(COMMDIR)\$D\ctrlcmn.obj \
+               $(COMMDIR)\$D\ctrlsub.obj \
+               $(COMMDIR)\$D\datacmn.obj \
+               $(COMMDIR)\$D\datetime.obj \
+               $(COMMDIR)\$D\datstrm.obj \
+               $(COMMDIR)\$D\db.obj \
+               $(COMMDIR)\$D\dbgrid.obj \
+               $(COMMDIR)\$D\dbtable.obj \
+               $(COMMDIR)\$D\dcbase.obj \
+               $(COMMDIR)\$D\dircmn.obj \
+               $(COMMDIR)\$D\dlgcmn.obj \
+               $(COMMDIR)\$D\dndcmn.obj \
+               $(COMMDIR)\$D\dobjcmn.obj \
+               $(COMMDIR)\$D\docmdi.obj \
+               $(COMMDIR)\$D\docview.obj \
+               $(COMMDIR)\$D\dpycmn.obj \
+               $(COMMDIR)\$D\dseldlg.obj \
+               $(COMMDIR)\$D\dynarray.obj \
+               $(COMMDIR)\$D\dynlib.obj \
+               $(COMMDIR)\$D\dynload.obj \
+               $(COMMDIR)\$D\effects.obj \
+               $(COMMDIR)\$D\encconv.obj \
+               $(COMMDIR)\$D\event.obj \
+               $(COMMDIR)\$D\extended.obj \
+               $(COMMDIR)\$D\fddlgcmn.obj \
+               $(COMMDIR)\$D\ffile.obj \
+               $(COMMDIR)\$D\file.obj \
+               $(COMMDIR)\$D\fileconf.obj \
+               $(COMMDIR)\$D\filefn.obj \
+               $(COMMDIR)\$D\filename.obj \
+               $(COMMDIR)\$D\filesys.obj \
+               $(COMMDIR)\$D\fldlgcmn.obj \
+               $(COMMDIR)\$D\fmapbase.obj \
+               $(COMMDIR)\$D\fontcmn.obj \
+               $(COMMDIR)\$D\fontmap.obj \
+               $(COMMDIR)\$D\framecmn.obj \
+               $(COMMDIR)\$D\fs_inet.obj \
+               $(COMMDIR)\$D\fs_mem.obj \
+               $(COMMDIR)\$D\fs_zip.obj \
+               $(COMMDIR)\$D\ftp.obj \
+               $(COMMDIR)\$D\gaugecmn.obj \
+               $(COMMDIR)\$D\gdicmn.obj \
+               $(COMMDIR)\$D\geometry.obj \
+               $(COMMDIR)\$D\gifdecod.obj \
+               $(COMMDIR)\$D\hash.obj \
+               $(COMMDIR)\$D\hashmap.obj \
+               $(COMMDIR)\$D\helpbase.obj \
+               $(COMMDIR)\$D\http.obj \
+               $(COMMDIR)\$D\iconbndl.obj \
+               $(COMMDIR)\$D\imagall.obj \
+               $(COMMDIR)\$D\imagbmp.obj \
+               $(COMMDIR)\$D\image.obj \
+               $(COMMDIR)\$D\imagfill.obj \
+               $(COMMDIR)\$D\imaggif.obj \
+               $(COMMDIR)\$D\imagiff.obj \
+               $(COMMDIR)\$D\imagjpeg.obj \
+               $(COMMDIR)\$D\imagpcx.obj \
+               $(COMMDIR)\$D\imagpng.obj \
+               $(COMMDIR)\$D\imagpnm.obj \
+               $(COMMDIR)\$D\imagtiff.obj \
+               $(COMMDIR)\$D\imagxpm.obj \
+               $(COMMDIR)\$D\intl.obj \
+               $(COMMDIR)\$D\ipcbase.obj \
+               $(COMMDIR)\$D\layout.obj \
+               $(COMMDIR)\$D\lboxcmn.obj \
+               $(COMMDIR)\$D\list.obj \
+               $(COMMDIR)\$D\log.obj \
+               $(COMMDIR)\$D\longlong.obj \
+               $(COMMDIR)\$D\matrix.obj \
+               $(COMMDIR)\$D\memory.obj \
+               $(COMMDIR)\$D\menucmn.obj \
+               $(COMMDIR)\$D\mimecmn.obj \
+               $(COMMDIR)\$D\module.obj \
+               $(COMMDIR)\$D\msgout.obj \
+               $(COMMDIR)\$D\mstream.obj \
+               $(COMMDIR)\$D\nbkbase.obj \
+               $(COMMDIR)\$D\object.obj \
+               $(COMMDIR)\$D\paper.obj \
+               $(COMMDIR)\$D\popupcmn.obj \
+               $(COMMDIR)\$D\prntbase.obj \
+               $(COMMDIR)\$D\process.obj \
+               $(COMMDIR)\$D\protocol.obj \
+               $(COMMDIR)\$D\quantize.obj \
+               $(COMMDIR)\$D\radiocmn.obj \
+               $(COMMDIR)\$D\regex.obj \
+               $(COMMDIR)\$D\rgncmn.obj \
+               $(COMMDIR)\$D\sckaddr.obj \
+               $(COMMDIR)\$D\sckfile.obj \
+               $(COMMDIR)\$D\sckipc.obj \
+               $(COMMDIR)\$D\sckstrm.obj \
+               $(COMMDIR)\$D\settcmn.obj \
+               $(COMMDIR)\$D\sizer.obj \
+               $(COMMDIR)\$D\socket.obj \
+               $(COMMDIR)\$D\statbar.obj \
+               $(COMMDIR)\$D\stopwatch.obj \
+               $(COMMDIR)\$D\strconv.obj \
+               $(COMMDIR)\$D\stream.obj \
+               $(COMMDIR)\$D\string.obj \
+               $(COMMDIR)\$D\sysopt.obj \
+               $(COMMDIR)\$D\taskbarcmn.obj \
+               $(COMMDIR)\$D\tbarbase.obj \
+               $(COMMDIR)\$D\textbuf.obj \
+               $(COMMDIR)\$D\textcmn.obj \
+               $(COMMDIR)\$D\textfile.obj \
+               $(COMMDIR)\$D\timercmn.obj \
+               $(COMMDIR)\$D\tokenzr.obj \
+               $(COMMDIR)\$D\toplvcmn.obj \
+               $(COMMDIR)\$D\treebase.obj \
+               $(COMMDIR)\$D\txtstrm.obj \
+               $(COMMDIR)\$D\unzip.obj \
+               $(COMMDIR)\$D\url.obj \
+               $(COMMDIR)\$D\utilscmn.obj \
+               $(COMMDIR)\$D\valgen.obj \
+               $(COMMDIR)\$D\validate.obj \
+               $(COMMDIR)\$D\valtext.obj \
+               $(COMMDIR)\$D\variant.obj \
+               $(COMMDIR)\$D\wfstream.obj \
+               $(COMMDIR)\$D\wincmn.obj \
+               $(COMMDIR)\$D\wxchar.obj \
+               $(COMMDIR)\$D\xpmdecod.obj \
+               $(COMMDIR)\$D\zipstrm.obj \
+               $(COMMDIR)\$D\zstream.obj
+
+MSWOBJS = $(MSWDIR)\$D\accel.obj \
+               $(OLEDIR)\$D\access.obj \
+               $(MSWDIR)\$D\app.obj \
+               $(OLEDIR)\$D\automtn.obj \
+               $(MSWDIR)\$D\basemsw.obj \
+               $(MSWDIR)\$D\bitmap.obj \
+               $(MSWDIR)\$D\bmpbuttn.obj \
+               $(MSWDIR)\$D\brush.obj \
+               $(MSWDIR)\$D\button.obj \
+               $(MSWDIR)\$D\caret.obj \
+               $(MSWDIR)\$D\checkbox.obj \
+               $(MSWDIR)\$D\checklst.obj \
+               $(MSWDIR)\$D\choice.obj \
+               $(MSWDIR)\$D\clipbrd.obj \
+               $(MSWDIR)\$D\colordlg.obj \
+               $(MSWDIR)\$D\colour.obj \
+               $(MSWDIR)\$D\combobox.obj \
+               $(MSWDIR)\$D\control.obj \
+               $(MSWDIR)\$D\cursor.obj \
+               $(MSWDIR)\$D\data.obj \
+               $(OLEDIR)\$D\dataobj.obj \
+               $(MSWDIR)\$D\dc.obj \
+               $(MSWDIR)\$D\dcclient.obj \
+               $(MSWDIR)\$D\dcmemory.obj \
+               $(MSWDIR)\$D\dcprint.obj \
+               $(MSWDIR)\$D\dcscreen.obj \
+               $(MSWDIR)\$D\dde.obj \
+               $(MSWDIR)\$D\dialog.obj \
+               $(MSWDIR)\$D\dialup.obj \
+               $(MSWDIR)\$D\dib.obj \
+               $(MSWDIR)\$D\dir.obj \
+               $(MSWDIR)\$D\dirdlg.obj \
+               $(MSWDIR)\$D\display.obj \
+               $(MSWDIR)\$D\dragimag.obj \
+               $(OLEDIR)\$D\dropsrc.obj \
+               $(OLEDIR)\$D\droptgt.obj \
+               $(MSWDIR)\$D\enhmeta.obj \
+               $(MSWDIR)\$D\evtloop.obj \
+               $(MSWDIR)\$D\fdrepdlg.obj \
+               $(MSWDIR)\$D\filedlg.obj \
+               $(MSWDIR)\$D\font.obj \
+               $(MSWDIR)\$D\fontdlg.obj \
+               $(MSWDIR)\$D\fontenum.obj \
+               $(MSWDIR)\$D\fontutil.obj \
+               $(MSWDIR)\$D\frame.obj \
+               $(MSWDIR)\$D\gauge95.obj \
+               $(MSWDIR)\$D\gdiimage.obj \
+               $(MSWDIR)\$D\gdiobj.obj \
+               $(MSWDIR)\$D\glcanvas.obj \
+               $(MSWDIR)\$D\gsocket.obj \
+               $(MSWDIR)\$D\gsockmsw.obj \
+               $(MSWDIR)\$D\helpbest.obj \
+               $(MSWDIR)\$D\helpchm.obj \
+               $(MSWDIR)\$D\helpwin.obj \
+               $(MSWDIR)\$D\icon.obj \
+               $(MSWDIR)\$D\imaglist.obj \
+               $(MSWDIR)\$D\iniconf.obj \
+               $(MSWDIR)\$D\joystick.obj \
+               $(MSWDIR)\$D\listbox.obj \
+               $(MSWDIR)\$D\listctrl.obj \
+               $(MSWDIR)\$D\main.obj \
+               $(MSWDIR)\$D\mdi.obj \
+               $(MSWDIR)\$D\menu.obj \
+               $(MSWDIR)\$D\menuitem.obj \
+               $(MSWDIR)\$D\metafile.obj \
+               $(MSWDIR)\$D\mimetype.obj \
+               $(MSWDIR)\$D\minifram.obj \
+               $(MSWDIR)\$D\msgdlg.obj \
+               $(MSWDIR)\$D\mslu.obj \
+               $(MSWDIR)\$D\nativdlg.obj \
+               $(MSWDIR)\$D\notebook.obj \
+               $(OLEDIR)\$D\oleutils.obj \
+               $(MSWDIR)\$D\ownerdrw.obj \
+               $(MSWDIR)\$D\palette.obj \
+               $(MSWDIR)\$D\pen.obj \
+               $(MSWDIR)\$D\penwin.obj \
+               $(MSWDIR)\$D\popupwin.obj \
+               $(MSWDIR)\$D\printdlg.obj \
+               $(MSWDIR)\$D\printwin.obj \
+               $(MSWDIR)\$D\radiobox.obj \
+               $(MSWDIR)\$D\radiobut.obj \
+               $(MSWDIR)\$D\regconf.obj \
+               $(MSWDIR)\$D\region.obj \
+               $(MSWDIR)\$D\registry.obj \
+               $(MSWDIR)\$D\scrolbar.obj \
+               $(MSWDIR)\$D\settings.obj \
+               $(MSWDIR)\$D\slider95.obj \
+               $(MSWDIR)\$D\snglinst.obj \
+               $(MSWDIR)\$D\spinbutt.obj \
+               $(MSWDIR)\$D\spinctrl.obj \
+               $(MSWDIR)\$D\statbmp.obj \
+               $(MSWDIR)\$D\statbox.obj \
+               $(MSWDIR)\$D\statbr95.obj \
+               $(MSWDIR)\$D\statline.obj \
+               $(MSWDIR)\$D\stattext.obj \
+               $(MSWDIR)\$D\tabctrl.obj \
+               $(MSWDIR)\$D\taskbar.obj \
+               $(MSWDIR)\$D\tbar95.obj \
+               $(MSWDIR)\$D\textctrl.obj \
+               $(MSWDIR)\$D\tglbtn.obj \
+               $(MSWDIR)\$D\thread.obj \
+               $(MSWDIR)\$D\timer.obj \
+               $(MSWDIR)\$D\tooltip.obj \
+               $(MSWDIR)\$D\toplevel.obj \
+               $(MSWDIR)\$D\treectrl.obj \
+               $(MSWDIR)\$D\utils.obj \
+               $(MSWDIR)\$D\utilsexc.obj \
+               $(MSWDIR)\$D\utilsgui.obj \
+               $(OLEDIR)\$D\uuid.obj \
+               $(MSWDIR)\$D\uxtheme.obj \
+               $(MSWDIR)\$D\volume.obj \
+               $(MSWDIR)\$D\wave.obj \
+               $(MSWDIR)\$D\window.obj
+
+HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
+               $(HTMLDIR)\$D\helpdata.obj \
+               $(HTMLDIR)\$D\helpfrm.obj \
+               $(HTMLDIR)\$D\htmlcell.obj \
+               $(HTMLDIR)\$D\htmlfilt.obj \
+               $(HTMLDIR)\$D\htmlpars.obj \
+               $(HTMLDIR)\$D\htmltag.obj \
+               $(HTMLDIR)\$D\htmlwin.obj \
+               $(HTMLDIR)\$D\htmprint.obj \
+               $(HTMLDIR)\$D\m_dflist.obj \
+               $(HTMLDIR)\$D\m_fonts.obj \
+               $(HTMLDIR)\$D\m_hline.obj \
+               $(HTMLDIR)\$D\m_image.obj \
+               $(HTMLDIR)\$D\m_layout.obj \
+               $(HTMLDIR)\$D\m_links.obj \
+               $(HTMLDIR)\$D\m_list.obj \
+               $(HTMLDIR)\$D\m_pre.obj \
+               $(HTMLDIR)\$D\m_style.obj \
+               $(HTMLDIR)\$D\m_tables.obj \
+               $(HTMLDIR)\$D\winpars.obj
 
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
 # Normal, static library
 # Normal, static library
-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
 
 
-setuph:
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(WXDIR)\include\wx\msw\setup.h:
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
+    copy $(WXDIR)\include\wx\msw\setup.h $@
 
 
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
 
 $D:
     mkdir $D
 
 $D:
     mkdir $D
@@ -398,20 +447,33 @@ $(OLEDIR)\$D:
 $(HTMLDIR)\$D:
     mkdir $(HTMLDIR)\$D
 
 $(HTMLDIR)\$D:
     mkdir $(HTMLDIR)\$D
 
+$(JPEGDIR)\$D:
+    mkdir $(JPEGDIR)\$D
+
+$(TIFFDIR)\$D:
+    mkdir $(TIFFDIR)\$D
+
+$(REGEXDIR)\$D:
+    mkdir $(REGEXDIR)\$D
+
+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
+
 # wxWindows library as DLL
 dll:
 # wxWindows library as DLL
 dll:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 cleandll:
 
 cleandll:
-        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
-        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
@@ -433,12 +495,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
 
 ### Static library
 
-$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) $(PERIPH_LIBS)
        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
        -erase $(LIBTARGET)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
 <<
 
 !else
 <<
 
 !else
@@ -458,16 +520,26 @@ GL_LIBS=opengl32.lib glu32.lib
 # GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
 # GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
+!if "$(USE_MSVC_5)" == "1"
+# we are too big
+INCREMENTAL=/INCREMENTAL:NO
+DELAY_LOAD=
+!else
+INCREMENTAL=
+DELAY_LOAD=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
+
 # Update the dynamic link library
 $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
 # Update the dynamic link library
 $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
-    $(LINKFLAGS)
+    $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
     -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 $(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)
+    $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.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\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
 <<
 
 !endif
 <<
 
 !endif
@@ -477,13 +549,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
 
-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
-        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
-        cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
@@ -500,9 +567,6 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp
 <<
        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 @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
@@ -518,9 +582,6 @@ $(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 @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
-<<
-       cl @<<
-$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
@@ -550,30 +611,20 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
-# If taking wxWindows from CVS, setup.h doesn't exist yet.
-# Actually the 'if not exist setup.h' test doesn't work
-# (copies the file anyway)
-# we'll have to comment this rule out.
-
-# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
-#    cd "$(WXDIR)"\include\wx\msw
-#    if not exist setup.h copy setup0.h setup.h
-#    cd "$(WXDIR)"\src\msw
-
-..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
+$(COMMDIR)\$D\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
         cl @<<
         cl @<<
-$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+$(CPPFLAGS2) /c $(COMMDIR)\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 <<
 
 <<
 
-..\common\y_tab.c:     ..\common\dosyacc.c
-        copy "..\common"\dosyacc.c "..\common"\y_tab.c
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c
 
 
-..\common\lex_yy.c:    ..\common\doslex.c
-    copy "..\common"\doslex.c "..\common"\lex_yy.c
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
 
 
-$(OBJECTS):    $(WXDIR)/include/wx/setup.h
+$(OBJECTS):    $(SETUP_H)
 
 
-..\common\$D\unzip.obj:     ..\common\unzip.c
+$(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
         cl @<<
 $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 <<
         cl @<<
 $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 <<
@@ -582,7 +633,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 png:
     cd $(WXDIR)\src\png
 
 png:
     cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
     cd $(WXDIR)\src\msw
 
 clean_png:
     cd $(WXDIR)\src\msw
 
 clean_png:
@@ -592,7 +643,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
 
 zlib:
     cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
     cd $(WXDIR)\src\msw
 
 clean_zlib:
     cd $(WXDIR)\src\msw
 
 clean_zlib:
@@ -602,7 +653,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
 
 jpeg:
     cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -612,7 +663,7 @@ clean_jpeg:
 
 tiff:
     cd $(WXDIR)\src\tiff
 
 tiff:
     cd $(WXDIR)\src\tiff
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
 clean_tiff:
     cd $(WXDIR)\src\msw
 
 clean_tiff:
@@ -620,13 +671,13 @@ clean_tiff:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+regex:
+    cd $(WXDIR)\src\regex
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
     cd $(WXDIR)\src\msw
 
-clean_xpm:
-    cd $(WXDIR)\src\xpm
+clean_regex:
+    cd $(WXDIR)\src\regex
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
@@ -635,12 +686,12 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-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
+cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
+        -erase ..\..\lib\$(WXLIBNAME).dll
+        -erase ..\..\lib\$(WXLIBNAME).lib
+        -erase ..\..\lib\$(WXLIBNAME).exp
+        -erase ..\..\lib\$(WXLIBNAME).pdb
+        -erase ..\..\lib\$(WXLIBNAME).ilk
 
 
 clean: $(PERIPH_CLEAN_TARGET)
 
 
 clean: $(PERIPH_CLEAN_TARGET)
@@ -649,6 +700,9 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
+       -erase $(WXDIR)\$D\$(PCH)
+       -erase $(WXDIR)\$D\*.pdb
+       -erase $(WXDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr
         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr
@@ -660,54 +714,96 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase $(MSWDIR)\$D\*.obj
         -erase $(MSWDIR)\$D\*.sbr
         -erase $(MSWDIR)\$D\*.pdb
         -erase $(MSWDIR)\$D\*.obj
         -erase $(MSWDIR)\$D\*.sbr
         -erase $(MSWDIR)\$D\*.pdb
+        -erase $(MSWDIR)\$D\*.pch
         -erase $(OLEDIR)\$D\*.obj
         -erase $(OLEDIR)\$D\*.sbr
         -erase $(OLEDIR)\$D\*.pdb
         -erase $(HTMLDIR)\$D\*.obj
         -erase $(HTMLDIR)\$D\*.sbr
         -erase $(HTMLDIR)\$D\*.pdb
         -erase $(OLEDIR)\$D\*.obj
         -erase $(OLEDIR)\$D\*.sbr
         -erase $(OLEDIR)\$D\*.pdb
         -erase $(HTMLDIR)\$D\*.obj
         -erase $(HTMLDIR)\$D\*.sbr
         -erase $(HTMLDIR)\$D\*.pdb
+        -erase $(JPEGDIR)\$D\*.obj
+        -erase $(JPEGDIR)\$D\*.sbr
+        -erase $(JPEGDIR)\$D\*.idb
+        -erase $(JPEGDIR)\$D\*.pdb
+        -erase $(TIFFDIR)\$D\*.obj
+        -erase $(TIFFDIR)\$D\*.sbr
+        -erase $(TIFFDIR)\$D\*.pdb
+        -erase $(TIFFDIR)\$D\*.idb
         -rmdir $(D)
         -rmdir $(D)
-        -rmdir ole\$(D)
-        -rmdir ..\generic\$(D)
-        -rmdir ..\common\$(D)
-        -rmdir ..\html\$(D)
-
+        -rmdir $(GENDIR)\$(D)
+        -rmdir $(COMMDIR)\$(D)
+        -rmdir $(MSWDIR)\$(D)
+        -rmdir $(OLEDIR)\$(D)
+        -rmdir $(HTMLDIR)\$(D)
+        -rmdir $(JPEGDIR)\$(D)
+        -rmdir $(TIFFDIR)\$(D)
+       -rmdir $(WXDIR)\$D
 
 # Making documents
 
 # Making documents
-docs:   allhlp allhtml allpdfrtf htb htmlhelp
+docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
-refhlp: $(DOCDIR)/winhelp/techref.hlp
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
-refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
-ps:     wxps referencps
+ps:     wxps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 wxps:  $(WXDIR)\docs\ps\wx.ps
-referencps:    $(WXDIR)\docs\ps\referenc.ps
 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc hlp
+        cd $(WXDIR)\contrib\src\fl
+        nmake -f makefile.vc hlp
         cd $(THISDIR)
 
 allhtml: wxhtml
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
         cd $(THISDIR)
 
 allhtml: wxhtml
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc html
+        cd $(WXDIR)\contrib\src\fl
+        cd $(THISDIR)
+
+allhtmlhelp: htmlhelp
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\contrib\src\fl
+        nmake -f makefile.vc htmlhelp
+        cd $(THISDIR)
+
+allhtb: htb
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\contrib\src\fl
+        nmake -f makefile.vc htb
         cd $(THISDIR)
 
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
         cd $(THISDIR)
 
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc ps
+        cd $(WXDIR)\contrib\src\fl
+        nmake -f makefile.vc ps
         cd $(THISDIR)
 
 allpdfrtf: pdfrtf
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
 allpdfrtf: pdfrtf
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc pdfrtf
+        cd $(WXDIR)\contrib\src\fl
+        nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
@@ -720,24 +816,11 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 
-$(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
-        cd $(DOCDIR)/latex/techref
-        -erase techref.ph
-        hc techref
-        move techref.hlp $(DOCDIR)\winhelp\techref.hlp
-        move techref.cnt $(DOCDIR)\winhelp\techref.cnt
-        cd $(THISDIR)
-
 $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 
 $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 
-$(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
-        cd $(THISDIR)
-
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -copy *.wmf $(DOCDIR)\pdf
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
         -copy *.wmf $(DOCDIR)\pdf
@@ -745,26 +828,26 @@ $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 
-$(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
-        cd $(THISDIR)
-
+# This target does two sets of HTML: one using a style sheet, for
+# the purposes of the CHM file, and one without.
 $(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
 $(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
+        -mkdir $(DOCDIR)\mshtml
+        -mkdir $(DOCDIR)\mshtml\wx
+        copy *.gif $(DOCDIR)\mshtml\wx
+        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\mshtml\wx\wx.htm -twice -html -macros $(DOCDIR)\latex\wx\tex2rtf_css.ini
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
         -erase $(DOCDIR)\latex\wx\*.con
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
         -erase $(DOCDIR)\latex\wx\*.con
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
-       cd $(DOCDIR)\html\wx
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+       cd $(DOCDIR)\mshtml\wx
+    copy $(DOCDIR)\latex\wx\wx.css .
        -hhc wx.hhp
     -mkdir ..\..\htmlhelp
     -erase $(DOCDIR)\htmlhelp\wx.chm
        -hhc wx.hhp
     -mkdir ..\..\htmlhelp
     -erase $(DOCDIR)\htmlhelp\wx.chm
wxWidgets (Impactor)