X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eebc8b5e7508437ace35805ca09616aba6bc545f..065de61268db77ee2424fdba219a25baaece0265:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 3d4db3d282..760110149b 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,9 +1,11 @@
-#
-# File:		makefile.nt
-# Author:	Julian Smart
-# Created:	1997
+# This file was automatically generated by tmake at 13:22, 1999/11/24
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
+
+# File:     makefile.vc
+# Author:   Julian Smart
+# Created:  1997
 # Updated:
-# Copyright:	(c) 1997, Julian Smart
+# Copyright: (c) 1997, Julian Smart
 #
 # "%W% %G%"
 #
@@ -44,6 +46,7 @@ COMMDIR=$(WXDIR)\src\common
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 DOCDIR = $(WXDIR)\docs
+HTMLDIR = $(WXDIR)\src\html
 
 {..\generic}.cpp{..\generic\$D}.obj:
 	cl @<<
@@ -55,219 +58,295 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
+{..\common}.c{..\common\$D}.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw}.cpp{..\msw\$D}.obj:
 	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
+{..\msw}.c{..\msw\$D}.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
 	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-GENERICOBJS= \
-  ..\generic\$D\choicdgg.obj \
-  ..\generic\$D\gridg.obj \
-  ..\generic\$D\laywin.obj \
-  ..\generic\$D\panelg.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\tabg.obj \
-  ..\generic\$D\textdlgg.obj
-
-#  ..\generic\$D\imaglist.obj \
-#  ..\generic\$D\treectrl.obj \
-#  ..\generic\$D\listctrl.obj \
-#  ..\generic\$D\notebook.obj \
+{..\html}.cpp{..\html\$D}.obj:
+	cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $<
+<<
+
+GENERICOBJS= ..\generic\$D\busyinfo.obj \
+		..\generic\$D\choicdgg.obj \
+		..\generic\$D\grid.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\splitter.obj \
+		..\generic\$D\statusbr.obj \
+		..\generic\$D\tabg.obj \
+		..\generic\$D\textdlgg.obj \
+		..\generic\$D\tipdlg.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\printps.obj \
-  ..\generic\$D\prntdlgg.obj \
-  ..\generic\$D\msgdlgg.obj \
-  ..\generic\$D\helpxlp.obj \
-  ..\generic\$D\colrdlgg.obj \
-  ..\generic\$D\fontdlgg.obj
+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\treectrl.obj
 
 COMMONOBJS = \
-  ..\common\$D\cmndata.obj \
-  ..\common\$D\config.obj \
-  ..\common\$D\dcbase.obj \
-  ..\common\$D\db.obj \
-  ..\common\$D\dbtable.obj \
-  ..\common\$D\docview.obj \
-  ..\common\$D\docmdi.obj \
-  ..\common\$D\dynarray.obj \
-  ..\common\$D\dynlib.obj \
-  ..\common\$D\event.obj \
-  ..\common\$D\file.obj \
-  ..\common\$D\filefn.obj \
-  ..\common\$D\fileconf.obj \
-  ..\common\$D\framecmn.obj \
-  ..\common\$D\ftp.obj \
-  ..\common\$D\gdicmn.obj \
-  ..\common\$D\image.obj \
-  ..\common\$D\imagjpeg.obj \
-  ..\common\$D\imagpng.obj \
-  ..\common\$D\imaggif.obj \
-  ..\common\$D\intl.obj \
-  ..\common\$D\ipcbase.obj \
-  ..\common\$D\helpbase.obj \
-  ..\common\$D\layout.obj \
-  ..\common\$D\log.obj \
-  ..\common\$D\memory.obj \
-  ..\common\$D\mimetype.obj \
-  ..\common\$D\module.obj \
-  ..\common\$D\odbc.obj \
-  ..\common\$D\object.obj \
-  ..\common\$D\prntbase.obj \
-  ..\common\$D\resource.obj \
-  ..\common\$D\tbarbase.obj \
-  ..\common\$D\tbarsmpl.obj \
-  ..\common\$D\textfile.obj \
-  ..\common\$D\timercmn.obj \
-  ..\common\$D\utilscmn.obj \
-  ..\common\$D\validate.obj \
-  ..\common\$D\valgen.obj \
-  ..\common\$D\valtext.obj \
-  ..\common\$D\date.obj \
-  ..\common\$D\hash.obj \
-  ..\common\$D\list.obj \
-  ..\common\$D\paper.obj \
-  ..\common\$D\string.obj \
-  ..\common\$D\socket.obj \
-  ..\common\$D\sckaddr.obj \
-  ..\common\$D\sckint.obj \
-  ..\common\$D\sckfile.obj \
-  ..\common\$D\sckipc.obj \
-  ..\common\$D\sckstrm.obj \
-  ..\common\$D\url.obj \
-  ..\common\$D\http.obj \
-  ..\common\$D\protocol.obj \
-  ..\common\$D\time.obj \
-  ..\common\$D\tokenzr.obj \
-  ..\common\$D\wxexpr.obj \
-  ..\common\$D\y_tab.obj \
-  ..\common\$D\extended.obj \
-  ..\common\$D\process.obj \
-  ..\common\$D\wfstream.obj \
-  ..\common\$D\mstream.obj \
-  ..\common\$D\zstream.obj \
-  ..\common\$D\stream.obj \
-  ..\common\$D\datstrm.obj \
-  ..\common\$D\objstrm.obj \
-  ..\common\$D\variant.obj \
-  ..\common\$D\wincmn.obj \
-  ..\common\$D\wxchar.obj
-
-MSWOBJS = \
-  ..\msw\$D\accel.obj \
-  ..\msw\$D\app.obj \
-  ..\msw\$D\bitmap.obj \
-  ..\msw\$D\bmpbuttn.obj \
-  ..\msw\$D\brush.obj \
-  ..\msw\$D\button.obj \
-  ..\msw\$D\checkbox.obj \
-  ..\msw\$D\checklst.obj \
-  ..\msw\$D\caret.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\$D\dc.obj \
-  ..\msw\$D\dcmemory.obj \
-  ..\msw\$D\dcclient.obj \
-  ..\msw\$D\dcprint.obj \
-  ..\msw\$D\dcscreen.obj \
-  ..\msw\$D\dde.obj \
-  ..\msw\$D\dialog.obj \
-  ..\msw\$D\dib.obj \
-  ..\msw\$D\dibutils.obj \
-  ..\msw\$D\dirdlg.obj \
-  ..\msw\$D\dragimag.obj \
-  ..\msw\$D\filedlg.obj \
-  ..\msw\$D\font.obj \
-  ..\msw\$D\fontdlg.obj \
-  ..\msw\$D\frame.obj \
-  ..\msw\$D\gauge95.obj \
-  ..\msw\$D\gaugemsw.obj \
-  ..\msw\$D\gdiobj.obj \
-  ..\msw\$D\helpwin.obj \
-  ..\msw\$D\icon.obj \
-  ..\msw\$D\iniconf.obj \
-  ..\msw\$D\joystick.obj \
-  ..\msw\$D\imaglist.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\minifram.obj \
-  ..\msw\$D\msgdlg.obj \
-  ..\msw\$D\nativdlg.obj \
-  ..\msw\$D\notebook.obj \
-  ..\msw\$D\ownerdrw.obj \
-  ..\msw\$D\palette.obj \
-  ..\msw\$D\pen.obj \
-  ..\msw\$D\penwin.obj \
-  ..\msw\$D\pnghand.obj \
-  ..\msw\$D\printdlg.obj \
-  ..\msw\$D\printwin.obj \
-  ..\msw\$D\radiobox.obj \
-  ..\msw\$D\radiobut.obj \
-  ..\msw\$D\region.obj \
-  ..\msw\$D\registry.obj \
-  ..\msw\$D\regconf.obj \
-  ..\msw\$D\scrolbar.obj \
-  ..\msw\$D\settings.obj \
-  ..\msw\$D\slidrmsw.obj \
-  ..\msw\$D\slider95.obj \
-  ..\msw\$D\spinbutt.obj \
-  ..\msw\$D\statbmp.obj \
-  ..\msw\$D\statbox.obj \
-  ..\msw\$D\statbr95.obj \
-  ..\msw\$D\stattext.obj \
-  ..\msw\$D\tabctrl.obj \
-  ..\msw\$D\taskbar.obj \
-  ..\msw\$D\tbar95.obj \
-  ..\msw\$D\tbarmsw.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\ole\$D\dataobj.obj \
-  ..\msw\ole\$D\automtn.obj \
-  ..\msw\ole\$D\droptgt.obj \
-  ..\msw\ole\$D\dropsrc.obj \
-  ..\msw\ole\$D\oleutils.obj
+		..\common\$D\y_tab.obj \
+		..\common\$D\appcmn.obj \
+		..\common\$D\choiccmn.obj \
+		..\common\$D\clipcmn.obj \
+		..\common\$D\cmndata.obj \
+		..\common\$D\config.obj \
+		..\common\$D\ctrlcmn.obj \
+		..\common\$D\ctrlsub.obj \
+		..\common\$D\date.obj \
+		..\common\$D\datstrm.obj \
+		..\common\$D\db.obj \
+		..\common\$D\dbtable.obj \
+		..\common\$D\dcbase.obj \
+		..\common\$D\dlgcmn.obj \
+		..\common\$D\dobjcmn.obj \
+		..\common\$D\docmdi.obj \
+		..\common\$D\docview.obj \
+		..\common\$D\dynarray.obj \
+		..\common\$D\dynlib.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_zip.obj \
+		..\common\$D\ftp.obj \
+		..\common\$D\gdicmn.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\intl.obj \
+		..\common\$D\ipcbase.obj \
+		..\common\$D\layout.obj \
+		..\common\$D\lboxcmn.obj \
+		..\common\$D\list.obj \
+		..\common\$D\log.obj \
+		..\common\$D\memory.obj \
+		..\common\$D\menucmn.obj \
+		..\common\$D\mimetype.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\tbarsmpl.obj \
+		..\common\$D\textcmn.obj \
+		..\common\$D\textfile.obj \
+		..\common\$D\time.obj \
+		..\common\$D\timercmn.obj \
+		..\common\$D\tokenzr.obj \
+		..\common\$D\txtstrm.obj \
+		..\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\dirdlg.obj \
+		..\msw\$D\dragimag.obj \
+		..\msw\ole\$D\dropsrc.obj \
+		..\msw\ole\$D\droptgt.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\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\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\pnghand.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_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_pre.obj \
+		..\html\$D\m_tables.obj \
+		..\html\$D\winpars.obj
+
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+# Add $(HTMLOBJS) if wanting wxHTML classes
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+
 
 test:   $(MSWDIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
@@ -287,6 +366,9 @@ $(GENDIR)\$D:
 $(OLEDIR)\$D:
     mkdir $(OLEDIR)\$D
 
+$(HTMLDIR)\$D:
+    mkdir $(HTMLDIR)\$D
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -343,11 +425,11 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 <<
 
 # Update the dynamic link library
-$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+$(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
+    $(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
 <<
 
 !endif
@@ -369,16 +451,11 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 # (copies the file anyway)
 # we'll have to comment this rule out.
 
-#$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+# $(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\extended.obj:     ..\common\extended.c
-        cl @<<
-$(CPPFLAGS2) /c $(COMMDIR)\extended.c /Fo$@
-<<
-
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
         cl @<<
 $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
@@ -392,11 +469,16 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 
 $(OBJECTS):	$(WXDIR)/include/wx/setup.h
 
+..\common\$D\unzip.obj:     ..\common\unzip.c
+        cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
+<<
+
 # Peripheral components
 
 png:
     cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_png:
@@ -406,7 +488,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_zlib:
@@ -416,7 +498,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -426,7 +508,7 @@ clean_jpeg:
 
 xpm:
     cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_xpm:
@@ -439,14 +521,14 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
-        -erase ..\..\lib\wx200.dll
-        -erase ..\..\lib\wx200.lib
-        -erase ..\..\lib\wx200.exp
-        -erase ..\..\lib\wx200.pdb
-        -erase ..\..\lib\wx200.ilk
+        -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
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
@@ -464,10 +546,14 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
         -erase $(OLEDIR)\$D\*.obj
         -erase $(OLEDIR)\$D\*.sbr
         -erase $(OLEDIR)\$D\*.pdb
+        -erase $(HTMLDIR)\$D\*.obj
+        -erase $(HTMLDIR)\$D\*.sbr
+        -erase $(HTMLDIR)\$D\*.pdb
         -rmdir $(D)
         -rmdir ole\$(D)
         -rmdir ..\generic\$(D)
         -rmdir ..\common\$(D)
+        -rmdir ..\html\$(D)
 
 cleanall: clean
 
@@ -485,6 +571,7 @@ proppdfrtf: $(DOCDIR)/pdf/prop.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml portinghtml
 wxhtml:	$(DOCDIR)\html\wx\wx.htm
+htmlhelp: $(DOCDIR)\html\wx\wx.chm
 prophtml: $(DOCDIR)\html\proplist\prop.htm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -614,25 +701,29 @@ $(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 
 $(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 *.bmp *.wmf $(DOCDIR)\pdf
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 
 $(DOCDIR)/pdf/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
         cd $(DOCDIR)\latex\porting
-        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
         cd $(THISDIR)
 
 $(DOCDIR)/pdf/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
         cd $(DOCDIR)\latex\proplist
-        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
         cd $(THISDIR)
 
 $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
         cd $(DOCDIR)\latex\techref
-        -copy *.bmp *.wmf $(DOCDIR)\pdf
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
         cd $(THISDIR)
 
@@ -646,6 +737,12 @@ $(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)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         cd $(DOCDIR)\latex\porting
         -mkdir $(DOCDIR)\html\porting
@@ -725,3 +822,10 @@ updatedocs: touchmanual alldocs
 updatepdf:  # touchmanual pdfrtf
     start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
+
+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
+