If zero time is specified, don't try to sleep when using a timer.

[wxWidgets.git] / src / msw / makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 9acff308e219ba29a866a7293944a005b167e588..d295925c5b0ad493b100b2864727e6f8f25729a4 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# 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


@@ -35,7 +35,7 @@ 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 0 if you are using MSVC 5
+# Set to 1 if you are using MSVC 5

 USE_MSVC_5=0
 
 # These are absolute paths, so that the compiler
 USE_MSVC_5=0
 
 # These are absolute paths, so that the compiler


@@ -91,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.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\dcpsg.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \


@@ -123,19 +124,23 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
                $(GENDIR)\$D\dirdlgg.obj \
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
                $(GENDIR)\$D\dirdlgg.obj \

+               $(GENDIR)\$D\filedlgg.obj \

                $(GENDIR)\$D\fontdlgg.obj \
                $(GENDIR)\$D\helpext.obj \
                $(GENDIR)\$D\helphtml.obj \
                $(GENDIR)\$D\fontdlgg.obj \
                $(GENDIR)\$D\helpext.obj \
                $(GENDIR)\$D\helphtml.obj \

-               $(GENDIR)\$D\helpwxht.obj \

                $(GENDIR)\$D\imaglist.obj \
                $(GENDIR)\$D\listctrl.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 = \
                $(COMMDIR)\$D\y_tab.obj \
                $(GENDIR)\$D\msgdlgg.obj \
                $(GENDIR)\$D\notebook.obj \
                $(GENDIR)\$D\tabg.obj
 
 COMMONOBJS = \
                $(COMMDIR)\$D\y_tab.obj \

+               $(COMMDIR)\$D\accesscmn.obj \

                $(COMMDIR)\$D\appcmn.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\choiccmn.obj \
                $(COMMDIR)\$D\clipcmn.obj \
                $(COMMDIR)\$D\clntdata.obj \


@@ -159,6 +164,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\dobjcmn.obj \
                $(COMMDIR)\$D\docmdi.obj \
                $(COMMDIR)\$D\docview.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\dseldlg.obj \
                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \


@@ -189,9 +195,11 @@ COMMONOBJS = \
                $(COMMDIR)\$D\hashmap.obj \
                $(COMMDIR)\$D\helpbase.obj \
                $(COMMDIR)\$D\http.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\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\imaggif.obj \
                $(COMMDIR)\$D\imagiff.obj \
                $(COMMDIR)\$D\imagjpeg.obj \


@@ -212,6 +220,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\menucmn.obj \
                $(COMMDIR)\$D\mimecmn.obj \
                $(COMMDIR)\$D\module.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\mstream.obj \
                $(COMMDIR)\$D\nbkbase.obj \
                $(COMMDIR)\$D\object.obj \


@@ -229,6 +238,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\sckfile.obj \
                $(COMMDIR)\$D\sckipc.obj \
                $(COMMDIR)\$D\sckstrm.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\sizer.obj \
                $(COMMDIR)\$D\socket.obj \
                $(COMMDIR)\$D\statbar.obj \


@@ -261,6 +271,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\zstream.obj
 
 MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(COMMDIR)\$D\zstream.obj
 
 MSWOBJS = $(MSWDIR)\$D\accel.obj \

+               $(OLEDIR)\$D\access.obj \

                $(MSWDIR)\$D\app.obj \
                $(OLEDIR)\$D\automtn.obj \
                $(MSWDIR)\$D\bitmap.obj \
                $(MSWDIR)\$D\app.obj \
                $(OLEDIR)\$D\automtn.obj \
                $(MSWDIR)\$D\bitmap.obj \


@@ -292,6 +303,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\dibutils.obj \
                $(MSWDIR)\$D\dir.obj \
                $(MSWDIR)\$D\dirdlg.obj \
                $(MSWDIR)\$D\dibutils.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\dragimag.obj \
                $(OLEDIR)\$D\dropsrc.obj \
                $(OLEDIR)\$D\droptgt.obj \


@@ -315,6 +327,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\helpwin.obj \
                $(MSWDIR)\$D\icon.obj \
                $(MSWDIR)\$D\imaglist.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\joystick.obj \
                $(MSWDIR)\$D\listbox.obj \
                $(MSWDIR)\$D\listctrl.obj \


@@ -326,6 +339,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\mimetype.obj \
                $(MSWDIR)\$D\minifram.obj \
                $(MSWDIR)\$D\msgdlg.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\nativdlg.obj \
                $(MSWDIR)\$D\notebook.obj \
                $(OLEDIR)\$D\oleutils.obj \


@@ -333,6 +347,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\palette.obj \
                $(MSWDIR)\$D\pen.obj \
                $(MSWDIR)\$D\penwin.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\printdlg.obj \
                $(MSWDIR)\$D\printwin.obj \
                $(MSWDIR)\$D\radiobox.obj \


@@ -364,6 +379,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\utils.obj \
                $(MSWDIR)\$D\utilsexc.obj \
                $(OLEDIR)\$D\uuid.obj \
                $(MSWDIR)\$D\utils.obj \
                $(MSWDIR)\$D\utilsexc.obj \
                $(OLEDIR)\$D\uuid.obj \

+               $(MSWDIR)\$D\volume.obj \

                $(MSWDIR)\$D\wave.obj \
                $(MSWDIR)\$D\window.obj
 
                $(MSWDIR)\$D\wave.obj \
                $(MSWDIR)\$D\window.obj
 


@@ -383,7 +399,6 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
                $(HTMLDIR)\$D\m_layout.obj \
                $(HTMLDIR)\$D\m_links.obj \
                $(HTMLDIR)\$D\m_list.obj \
                $(HTMLDIR)\$D\m_layout.obj \
                $(HTMLDIR)\$D\m_links.obj \
                $(HTMLDIR)\$D\m_list.obj \

-               $(HTMLDIR)\$D\m_meta.obj \

                $(HTMLDIR)\$D\m_pre.obj \
                $(HTMLDIR)\$D\m_style.obj \
                $(HTMLDIR)\$D\m_tables.obj \
                $(HTMLDIR)\$D\m_pre.obj \
                $(HTMLDIR)\$D\m_style.obj \
                $(HTMLDIR)\$D\m_tables.obj \


@@ -394,7 +409,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 

-ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)

 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library


@@ -447,18 +462,18 @@ $(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) UNICODE=$(UNICODE)
+        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) UNICODE=$(UNICODE)
+        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 UNICODE=$(UNICODE)
+        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 UNICODE=$(UNICODE)
+        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


@@ -524,7 +539,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -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\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
+    $(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


@@ -624,7 +639,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:


@@ -634,7 +649,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:


@@ -644,7 +659,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:


@@ -654,7 +669,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:


@@ -664,7 +679,7 @@ clean_tiff:
 
 regex:
     cd $(WXDIR)\src\regex
 
 regex:
     cd $(WXDIR)\src\regex

-    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_regex:
     cd $(WXDIR)\src\msw
 
 clean_regex:


@@ -678,11 +693,11 @@ rcparser:
     cd $(WXDIR)\src\msw
 
 cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
     cd $(WXDIR)\src\msw
 
 cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex

-        -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\$(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)


@@ -735,23 +750,22 @@ 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
         cd $(WXDIR)\utils\tex2rtf\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 $(THISDIR)
 
 allhtml: wxhtml


@@ -759,6 +773,7 @@ allhtml: wxhtml
         nmake -f makefile.vc html
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc html
         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 $(THISDIR)
 
 allhtmlhelp: htmlhelp


@@ -766,6 +781,8 @@ allhtmlhelp: htmlhelp
         nmake -f makefile.vc htmlhelp
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc htmlhelp
         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 $(THISDIR)
 
 allhtb: htb


@@ -773,6 +790,8 @@ allhtb: htb
         nmake -f makefile.vc htb
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc htb
         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 $(THISDIR)
 
 allps: wxps referencps


@@ -780,6 +799,8 @@ allps: wxps referencps
         nmake -f makefile.vc ps
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc ps
         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 $(THISDIR)
 
 allpdfrtf: pdfrtf


@@ -787,6 +808,8 @@ allpdfrtf: pdfrtf
         nmake -f makefile.vc pdfrtf
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc pdfrtf
         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


@@ -799,24 +822,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


@@ -824,26 +834,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