]> 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
1. wxGetOsDescription() function added
[wxWidgets.git] / src / msw / makefile.vc
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 7cdcfa176649550575f14724103d6fbe4b1a94f5..760110149b6a6c26e5cc9a0c25fe856a03f8cfb4 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,8 +1,4 @@
-
-
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# 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
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -62,11 +58,21 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 $(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}.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 $<
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
@@ -79,9 +85,10 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\choicdgg.obj \
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\choicdgg.obj \
-               ..\generic\$D\extdlgg.obj \
-               ..\generic\$D\gridg.obj \
+               ..\generic\$D\grid.obj \
                ..\generic\$D\laywin.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\panelg.obj \
                ..\generic\$D\progdlgg.obj \
                ..\generic\$D\prop.obj \
@@ -90,15 +97,23 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\sashwin.obj \
                ..\generic\$D\scrolwin.obj \
                ..\generic\$D\splitter.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\tabg.obj \
                ..\generic\$D\textdlgg.obj \
-               ..\generic\$D\tipdlg.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.
 
 # 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\colrdlgg.obj \
+NONESSENTIALOBJS= ..\generic\$D\caret.obj \
+               ..\generic\$D\colrdlgg.obj \
+               ..\generic\$D\dcpsg.obj \
                ..\generic\$D\dirdlgg.obj \
                ..\generic\$D\dirdlgg.obj \
+               ..\generic\$D\filedlgg.obj \
                ..\generic\$D\fontdlgg.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\helpxlp.obj \
                ..\generic\$D\imaglist.obj \
                ..\generic\$D\listctrl.obj \
@@ -106,48 +121,63 @@ NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
                ..\generic\$D\notebook.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
                ..\generic\$D\notebook.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
-               ..\generic\$D\statusbr.obj \
+               ..\generic\$D\statline.obj \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
-               ..\common\$D\extended.obj \
                ..\common\$D\y_tab.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\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\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\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\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\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\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\imagbmp.obj \
                ..\common\$D\image.obj \
                ..\common\$D\imaggif.obj \
                ..\common\$D\imagjpeg.obj \
+               ..\common\$D\imagpcx.obj \
                ..\common\$D\imagpng.obj \
                ..\common\$D\imagpng.obj \
+               ..\common\$D\imagpnm.obj \
                ..\common\$D\intl.obj \
                ..\common\$D\ipcbase.obj \
                ..\common\$D\layout.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\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\mimetype.obj \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
@@ -161,14 +191,17 @@ COMMONOBJS = \
                ..\common\$D\resource.obj \
                ..\common\$D\sckaddr.obj \
                ..\common\$D\sckfile.obj \
                ..\common\$D\resource.obj \
                ..\common\$D\sckaddr.obj \
                ..\common\$D\sckfile.obj \
-               ..\common\$D\sckint.obj \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \
+               ..\common\$D\serbase.obj \
+               ..\common\$D\sizer.obj \
                ..\common\$D\socket.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\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\textfile.obj \
                ..\common\$D\time.obj \
                ..\common\$D\timercmn.obj \
@@ -185,12 +218,12 @@ COMMONOBJS = \
                ..\common\$D\wincmn.obj \
                ..\common\$D\wxchar.obj \
                ..\common\$D\wxexpr.obj \
                ..\common\$D\wincmn.obj \
                ..\common\$D\wxchar.obj \
                ..\common\$D\wxexpr.obj \
-               ..\common\$D\zipstream.obj \
+               ..\common\$D\zipstrm.obj \
                ..\common\$D\zstream.obj
 
 MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\app.obj \
                ..\common\$D\zstream.obj
 
 MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\app.obj \
-               ..\msw\$D\automtn.obj \
+               ..\msw\ole\$D\automtn.obj \
                ..\msw\$D\bitmap.obj \
                ..\msw\$D\bmpbuttn.obj \
                ..\msw\$D\brush.obj \
                ..\msw\$D\bitmap.obj \
                ..\msw\$D\bmpbuttn.obj \
                ..\msw\$D\brush.obj \
@@ -207,7 +240,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\curico.obj \
                ..\msw\$D\cursor.obj \
                ..\msw\$D\data.obj \
                ..\msw\$D\curico.obj \
                ..\msw\$D\cursor.obj \
                ..\msw\$D\data.obj \
-               ..\msw\$D\dataobj.obj \
+               ..\msw\ole\$D\dataobj.obj \
                ..\msw\$D\dc.obj \
                ..\msw\$D\dcclient.obj \
                ..\msw\$D\dcmemory.obj \
                ..\msw\$D\dc.obj \
                ..\msw\$D\dcclient.obj \
                ..\msw\$D\dcmemory.obj \
@@ -215,24 +248,29 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\dcscreen.obj \
                ..\msw\$D\dde.obj \
                ..\msw\$D\dialog.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\$D\dib.obj \
                ..\msw\$D\dibutils.obj \
                ..\msw\$D\dirdlg.obj \
                ..\msw\$D\dragimag.obj \
-               ..\msw\$D\dropsrc.obj \
-               ..\msw\$D\droptgt.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\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\frame.obj \
                ..\msw\$D\gauge95.obj \
-               ..\msw\$D\gaugemsw.obj \
+               ..\msw\$D\gdiimage.obj \
                ..\msw\$D\gdiobj.obj \
                ..\msw\$D\gdiobj.obj \
+               ..\msw\$D\gsocket.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\icon.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\icon.obj \
-               ..\msw\$D\iniconf.obj \
+               ..\msw\$D\imaglist.obj \
                ..\msw\$D\joystick.obj \
                ..\msw\$D\listbox.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\main.obj \
                ..\msw\$D\mdi.obj \
                ..\msw\$D\menu.obj \
@@ -241,7 +279,8 @@ MSWOBJS = ..\msw\$D\accel.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 \
-               ..\msw\$D\oleutils.obj \
+               ..\msw\$D\notebook.obj \
+               ..\msw\ole\$D\oleutils.obj \
                ..\msw\$D\ownerdrw.obj \
                ..\msw\$D\palette.obj \
                ..\msw\$D\pen.obj \
                ..\msw\$D\ownerdrw.obj \
                ..\msw\$D\palette.obj \
                ..\msw\$D\pen.obj \
@@ -257,8 +296,8 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\scrolbar.obj \
                ..\msw\$D\settings.obj \
                ..\msw\$D\slider95.obj \
                ..\msw\$D\scrolbar.obj \
                ..\msw\$D\settings.obj \
                ..\msw\$D\slider95.obj \
-               ..\msw\$D\slidrmsw.obj \
                ..\msw\$D\spinbutt.obj \
                ..\msw\$D\spinbutt.obj \
+               ..\msw\$D\spinctrl.obj \
                ..\msw\$D\statbmp.obj \
                ..\msw\$D\statbox.obj \
                ..\msw\$D\statbr95.obj \
                ..\msw\$D\statbmp.obj \
                ..\msw\$D\statbox.obj \
                ..\msw\$D\statbr95.obj \
@@ -267,40 +306,41 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\tabctrl.obj \
                ..\msw\$D\taskbar.obj \
                ..\msw\$D\tbar95.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\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\$D\utils.obj \
                ..\msw\$D\utilsexc.obj \
-               ..\msw\$D\uuid.obj \
+               ..\msw\ole\$D\uuid.obj \
                ..\msw\$D\wave.obj \
                ..\msw\$D\window.obj \
                ..\msw\$D\xpmhand.obj
 
                ..\msw\$D\wave.obj \
                ..\msw\$D\window.obj \
                ..\msw\$D\xpmhand.obj
 
-HTMLOBJS = \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlhelp.obj \
-  ..\html\$D\htmlhelp_io.obj \
-  ..\html\$D\htmlparser.obj \
-  ..\html\$D\htmltag.obj \
-  ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.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.
 # Add $(HTMLOBJS) if wanting wxHTML classes
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) 
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -385,7 +425,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 <<
 
 # Update the dynamic link library
 <<
 
 # 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
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
@@ -416,11 +456,6 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 #    if not exist setup.h copy setup0.h setup.h
 #    cd "$(WXDIR)"\src\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$@
 ..\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$@
@@ -443,7 +478,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)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_png:
     cd $(WXDIR)\src\msw
 
 clean_png:
@@ -453,7 +488,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
 
 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:
     cd $(WXDIR)\src\msw
 
 clean_zlib:
@@ -463,7 +498,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
 
 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:
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -473,7 +508,7 @@ clean_jpeg:
 
 xpm:
     cd $(WXDIR)\src\xpm
 
 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:
     cd $(WXDIR)\src\msw
 
 clean_xpm:
@@ -486,14 +521,14 @@ 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_jpeg clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -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
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
@@ -511,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 $(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 $(D)
         -rmdir ole\$(D)
         -rmdir ..\generic\$(D)
         -rmdir ..\common\$(D)
+        -rmdir ..\html\$(D)
 
 cleanall: clean
 
 
 cleanall: clean
 
@@ -662,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
 
 $(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
         -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
         -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
         -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)
 
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
         cd $(THISDIR)
 
@@ -779,3 +822,10 @@ updatedocs: touchmanual alldocs
 updatepdf:  # touchmanual pdfrtf
     start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
 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
+
wxWidgets (Impactor)