]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.vc
compilation fix for tooltip patch code applied by Julian and w32api
[wxWidgets.git] / src / msw / makefile.vc
index 91d20815f5c9914b578d7242bb7c0023f1b7fe2c..bae4d983f84310445b60f9155a2577dc297e801c 100644 (file)
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake
 # 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
-DUMMYOBJ=$D\dummydll.obj
 !else
 LIBTARGET=$(WXLIB)
-DUMMYOBJ=$D\dummy.obj
 !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 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
@@ -49,6 +50,8 @@ DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 JPEGDIR = $(WXDIR)\src\jpeg
 TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
 
 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
@@ -88,6 +91,8 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 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 \
@@ -98,11 +103,9 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\numdlgg.obj \
                $(GENDIR)\$D\panelg.obj \
                $(GENDIR)\$D\progdlgg.obj \
-               $(GENDIR)\$D\prop.obj \
-               $(GENDIR)\$D\propform.obj \
-               $(GENDIR)\$D\proplist.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 \
@@ -112,35 +115,40 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\tipdlg.obj \
                $(GENDIR)\$D\tipwin.obj \
                $(GENDIR)\$D\treectlg.obj \
-               $(GENDIR)\$D\treelay.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.
 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\helpwxht.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 \
+               $(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 \
@@ -153,18 +161,24 @@ COMMONOBJS = \
                $(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 \
@@ -177,12 +191,16 @@ COMMONOBJS = \
                $(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 \
@@ -201,11 +219,10 @@ COMMONOBJS = \
                $(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\objstrm.obj \
-               $(COMMDIR)\$D\odbc.obj \
                $(COMMDIR)\$D\paper.obj \
                $(COMMDIR)\$D\popupcmn.obj \
                $(COMMDIR)\$D\prntbase.obj \
@@ -214,23 +231,28 @@ COMMONOBJS = \
                $(COMMDIR)\$D\quantize.obj \
                $(COMMDIR)\$D\radiocmn.obj \
                $(COMMDIR)\$D\regex.obj \
-               $(COMMDIR)\$D\resource.obj \
+               $(COMMDIR)\$D\rgncmn.obj \
                $(COMMDIR)\$D\sckaddr.obj \
                $(COMMDIR)\$D\sckfile.obj \
                $(COMMDIR)\$D\sckipc.obj \
                $(COMMDIR)\$D\sckstrm.obj \
-               $(COMMDIR)\$D\serbase.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 \
@@ -243,14 +265,15 @@ COMMONOBJS = \
                $(COMMDIR)\$D\wfstream.obj \
                $(COMMDIR)\$D\wincmn.obj \
                $(COMMDIR)\$D\wxchar.obj \
-               $(COMMDIR)\$D\wxexpr.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 \
@@ -264,7 +287,6 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\colour.obj \
                $(MSWDIR)\$D\combobox.obj \
                $(MSWDIR)\$D\control.obj \
-               $(MSWDIR)\$D\curico.obj \
                $(MSWDIR)\$D\cursor.obj \
                $(MSWDIR)\$D\data.obj \
                $(OLEDIR)\$D\dataobj.obj \
@@ -277,14 +299,15 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(MSWDIR)\$D\dialog.obj \
                $(MSWDIR)\$D\dialup.obj \
                $(MSWDIR)\$D\dib.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\enhmeta.obj \
                $(MSWDIR)\$D\evtloop.obj \
+               $(MSWDIR)\$D\fdrepdlg.obj \
                $(MSWDIR)\$D\filedlg.obj \
                $(MSWDIR)\$D\font.obj \
                $(MSWDIR)\$D\fontdlg.obj \
@@ -297,10 +320,12 @@ MSWOBJS = $(MSWDIR)\$D\accel.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 \
@@ -312,6 +337,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.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 \
@@ -319,6 +345,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.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 \
@@ -345,10 +372,14 @@ MSWOBJS = $(MSWDIR)\$D\accel.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
 
@@ -368,8 +399,8 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.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\winpars.obj
 
@@ -378,15 +409,25 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 # 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
-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib 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
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$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
@@ -412,20 +453,27 @@ $(JPEGDIR)\$D:
 $(TIFFDIR)\$D:
     mkdir $(TIFFDIR)\$D
 
+$(REGEXDIR)\$D:
+    mkdir $(REGEXDIR)\$D
+
+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
+
 # 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:
-        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:
-        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:
-        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
@@ -447,12 +495,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### 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)
-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
 <<
 
 !else
@@ -472,16 +520,26 @@ GL_LIBS=opengl32.lib glu32.lib
 # 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) @<<
-    $(LINKFLAGS)
+    $(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
-       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
@@ -491,13 +549,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(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).
@@ -514,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\resource.obj /c /Tp $(COMMDIR)\resource.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
@@ -532,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\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
 <<
        cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
@@ -575,7 +622,7 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.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)
 
 $(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
         cl @<<
@@ -586,7 +633,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 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:
@@ -596,7 +643,7 @@ clean_png:
 
 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:
@@ -606,7 +653,7 @@ clean_zlib:
 
 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:
@@ -616,7 +663,7 @@ clean_jpeg:
 
 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:
@@ -624,17 +671,27 @@ clean_tiff:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
+regex:
+    cd $(WXDIR)\src\regex
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
+    cd $(WXDIR)\src\msw
+
+clean_regex:
+    cd $(WXDIR)\src\regex
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
 rcparser:
     cd $(WXDIR)\utils\rcparser\src
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-cleanall: clean clean_png clean_zlib 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)
@@ -643,6 +700,9 @@ clean: $(PERIPH_CLEAN_TARGET)
         -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
@@ -677,65 +737,80 @@ clean: $(PERIPH_CLEAN_TARGET)
         -rmdir $(HTMLDIR)\$(D)
         -rmdir $(JPEGDIR)\$(D)
         -rmdir $(TIFFDIR)\$(D)
+       -rmdir $(WXDIR)\$D
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
-refhlp: $(DOCDIR)/winhelp/techref.hlp
 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
-ps:     wxps referencps
+ps:     wxps
 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
-        cd $(THISDIR)
+
+#        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 $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc html
-        cd $(THISDIR)
+
+#        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 $(THISDIR)
+
+#        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 $(THISDIR)
+
+#        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 $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc ps
-        cd $(THISDIR)
+#       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 $(WXDIR)\utils\tex2rtf\src
-        nmake -f makefile.vc pdfrtf
-        cd $(THISDIR)
+
+#        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 $(DOCDIR)/latex/wx
@@ -747,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)
 
-$(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/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
@@ -772,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)
 
-$(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
+        -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)
 
-$(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