]> 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
typo fixed
[wxWidgets.git] / src / msw / makefile.vc
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index af305fa68cb4bc1e62426d0ec2ad1f05d2e275de..297b4118c6e0e14dc9c288d0eae87c43e10f14a0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:09, 2000/01/14
+# This file was automatically generated by tmake at 19:20, 2001/02/08
 # 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
@@ -27,9 +27,6 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
 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
 
 # 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=
 
 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
 # 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
@@ -86,7 +86,10 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\calctrl.obj \
                ..\generic\$D\choicdgg.obj \
 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\grid.obj \
+               ..\generic\$D\gridsel.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
@@ -97,11 +100,15 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\proplist.obj \
                ..\generic\$D\sashwin.obj \
                ..\generic\$D\scrolwin.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\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,
                ..\generic\$D\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -123,8 +130,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\statline.obj \
-               ..\generic\$D\tabg.obj \
-               ..\generic\$D\treectrl.obj
+               ..\generic\$D\tabg.obj
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
@@ -134,6 +140,7 @@ COMMONOBJS = \
                ..\common\$D\cmdline.obj \
                ..\common\$D\cmndata.obj \
                ..\common\$D\config.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\ctrlcmn.obj \
                ..\common\$D\ctrlsub.obj \
                ..\common\$D\datetime.obj \
@@ -142,11 +149,13 @@ COMMONOBJS = \
                ..\common\$D\dbtable.obj \
                ..\common\$D\dcbase.obj \
                ..\common\$D\dlgcmn.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\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\encconv.obj \
                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \
@@ -154,14 +163,17 @@ COMMONOBJS = \
                ..\common\$D\file.obj \
                ..\common\$D\fileconf.obj \
                ..\common\$D\filefn.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\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\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\gifdecod.obj \
                ..\common\$D\hash.obj \
                ..\common\$D\helpbase.obj \
@@ -182,9 +194,10 @@ COMMONOBJS = \
                ..\common\$D\list.obj \
                ..\common\$D\log.obj \
                ..\common\$D\longlong.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\memory.obj \
                ..\common\$D\menucmn.obj \
-               ..\common\$D\mimetype.obj \
+               ..\common\$D\mimecmn.obj \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
                ..\common\$D\object.obj \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
                ..\common\$D\object.obj \
@@ -194,6 +207,7 @@ COMMONOBJS = \
                ..\common\$D\prntbase.obj \
                ..\common\$D\process.obj \
                ..\common\$D\protocol.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\resource.obj \
                ..\common\$D\sckaddr.obj \
                ..\common\$D\sckfile.obj \
@@ -210,6 +224,7 @@ COMMONOBJS = \
                ..\common\$D\textfile.obj \
                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.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\txtstrm.obj \
                ..\common\$D\unzip.obj \
                ..\common\$D\url.obj \
@@ -270,7 +285,10 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\gauge95.obj \
                ..\msw\$D\gdiimage.obj \
                ..\msw\$D\gdiobj.obj \
                ..\msw\$D\gauge95.obj \
                ..\msw\$D\gdiimage.obj \
                ..\msw\$D\gdiobj.obj \
+               ..\msw\$D\glcanvas.obj \
                ..\msw\$D\gsocket.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\helpwin.obj \
                ..\msw\$D\icon.obj \
                ..\msw\$D\imaglist.obj \
@@ -282,6 +300,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\menu.obj \
                ..\msw\$D\menuitem.obj \
                ..\msw\$D\metafile.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\minifram.obj \
                ..\msw\$D\msgdlg.obj \
                ..\msw\$D\nativdlg.obj \
@@ -312,6 +331,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\taskbar.obj \
                ..\msw\$D\tbar95.obj \
                ..\msw\$D\textctrl.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\thread.obj \
                ..\msw\$D\timer.obj \
                ..\msw\$D\tooltip.obj \
@@ -339,6 +359,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
                ..\html\$D\m_layout.obj \
                ..\html\$D\m_links.obj \
                ..\html\$D\m_list.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\m_pre.obj \
                ..\html\$D\m_tables.obj \
                ..\html\$D\winpars.obj
@@ -349,13 +370,15 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
 
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+setuph:
+    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
 
 
-test:   $(MSWDIR)\$D\wave.obj
-test2:  ..\common\Debug\config.obj
 
 $D:
     mkdir $D
 
 $D:
     mkdir $D
@@ -415,7 +438,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
        $(implib) @<<
 -out:$@
 -machine:$(CPU)
-$(OBJECTS) $(PERIPH_LIBS)
+$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
 <<
 
 !else
 <<
 
 !else
@@ -430,16 +453,26 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).lib
 <<
 
     -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
 # 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
 
 <<
 
 !endif
 
+# /delayload:winmm.dll # Removed because it can cause a crash for some people
 
 ########################################################
 # Windows-specific objects
 
 ########################################################
 # Windows-specific objects
@@ -452,6 +485,71 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
 
 $(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).
+# Don't forget to put FINAL=1 on the command line.
+noopt:
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
+<<
+       cl @<<
+$(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\resource.obj /c /Tp $(COMMDIR)\resource.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
+<<
+       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 @<<
+$(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\control.obj /c /Tp $(MSWDIR)\control.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
+<<
+       cl @<<
+$(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)
 # 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)
@@ -537,14 +635,17 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
     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
         -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
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
@@ -554,7 +655,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)\$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
         -erase $(COMMDIR)\lex_yy.c
         -erase $(MSWDIR)\$D\*.obj
         -erase $(MSWDIR)\$D\*.sbr
@@ -571,10 +672,9 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti
         -rmdir ..\common\$(D)
         -rmdir ..\html\$(D)
 
         -rmdir ..\common\$(D)
         -rmdir ..\html\$(D)
 
-cleanall: clean
 
 # Making documents
 
 # Making documents
-docs:   allhlp allhtml allpdfrtf
+docs:   allhlp allhtml allpdfrtf htb htmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@@ -583,8 +683,9 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:  wxhtml
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:  wxhtml
+htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
-htmlhelp: $(DOCDIR)\html\wx\wx.chm
+htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps referencps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 referencps:    $(WXDIR)\docs\ps\referenc.ps
 ps:     wxps referencps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 referencps:    $(WXDIR)\docs\ps\referenc.ps
@@ -594,42 +695,11 @@ allhlp: wxhlp
         nmake -f makefile.vc hlp
         cd $(THISDIR)
 
         nmake -f makefile.vc hlp
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.vc hlp
-#        cd $(WXDIR)\utils\wxgrid\src
-#        nmake -f makefile.vc hlp
-
 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 $(THISDIR)
 
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc html
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc html
-
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
 allps: wxps referencps
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
@@ -640,22 +710,12 @@ allpdfrtf: pdfrtf
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
 
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc ps
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc ps
-#        cd $(THISDIR)
-
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
         -erase wx.ph
         hc wx
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         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)
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
@@ -695,6 +755,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
 $(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
         -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
@@ -702,9 +763,12 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
        cd $(DOCDIR)\html\wx
        -hhc 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 $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:     $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
@@ -739,12 +803,34 @@ $(WXDIR)\docs\ps\referenc.ps:     $(WXDIR)\docs\latex\wx\referenc.dvi
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         cd $(THISDIR)
 
         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 wx.zip wx.htb
+    zip 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
 
 # In order to force document reprocessing
 touchmanual:
     -touch $(WXDIR)\docs\latex\wx\manual.tex
 
 updatedocs: touchmanual alldocs
 
+cleandocs:
+    -erase $(DOCDIR)\winhelp\wx.hlp
+    -erase $(DOCDIR)\winhelp\wx.cnt
+    -erase $(DOCDIR)\html\wx\*.htm
+    -erase $(DOCDIR)\pdf\wx.rtf
+    -erase $(DOCDIR)\latex\wx\wx.rtf
+    -erase $(DOCDIR)\latex\wx\WX.PH
+    -erase $(DOCDIR)\htmlhelp\wx.chm
+    -erase $(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
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf
wxWidgets (Impactor)