compilation fix for non-threaded compilation (threads are still broken

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 2148e8be8621161995f44f572fc32ea6411f209a..eb11156d804f7b67ebb36e853f640102cdd29a6b 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 16:05, 1999/07/15
+# This file was automatically generated by tmake at 19:06, 2000/01/05

 # 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


@@ -58,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 $<


@@ -74,10 +84,12 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
 <<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \

+               ..\generic\$D\calctrl.obj \

                ..\generic\$D\choicdgg.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 \


@@ -87,15 +99,22 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\scrolwin.obj \
                ..\generic\$D\splitter.obj \
                ..\generic\$D\statusbr.obj \
                ..\generic\$D\scrolwin.obj \
                ..\generic\$D\splitter.obj \
                ..\generic\$D\statusbr.obj \

-               ..\generic\$D\tabg.obj \
+               ..\generic\$D\tbarsmpl.obj \

                ..\generic\$D\textdlgg.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 \


@@ -103,22 +122,32 @@ 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\statline.obj \
+               ..\generic\$D\tabg.obj \

                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \

+               ..\common\$D\appcmn.obj \
+               ..\common\$D\choiccmn.obj \
+               ..\common\$D\clipcmn.obj \
+               ..\common\$D\cmdline.obj \

                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \
                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \

-               ..\common\$D\date.obj \
+               ..\common\$D\ctrlcmn.obj \
+               ..\common\$D\ctrlsub.obj \
+               ..\common\$D\datetime.obj \

                ..\common\$D\datstrm.obj \
                ..\common\$D\db.obj \
                ..\common\$D\dbtable.obj \
                ..\common\$D\dcbase.obj \
                ..\common\$D\dlgcmn.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\docmdi.obj \
                ..\common\$D\docview.obj \
                ..\common\$D\dynarray.obj \
                ..\common\$D\dynlib.obj \

+               ..\common\$D\encconv.obj \

                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \
                ..\common\$D\ffile.obj \
                ..\common\$D\event.obj \
                ..\common\$D\extended.obj \
                ..\common\$D\ffile.obj \


@@ -126,25 +155,35 @@ COMMONOBJS = \
                ..\common\$D\fileconf.obj \
                ..\common\$D\filefn.obj \
                ..\common\$D\filesys.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\imagtiff.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\list.obj \
                ..\common\$D\log.obj \

+               ..\common\$D\longlong.obj \

                ..\common\$D\memory.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 \


@@ -158,16 +197,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\textcmn.obj \
                ..\common\$D\textfile.obj \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\tbarbase.obj \
                ..\common\$D\textcmn.obj \
                ..\common\$D\textfile.obj \

-               ..\common\$D\time.obj \

                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.obj \
                ..\common\$D\txtstrm.obj \
                ..\common\$D\timercmn.obj \
                ..\common\$D\tokenzr.obj \
                ..\common\$D\txtstrm.obj \


@@ -182,7 +222,7 @@ 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 \
                ..\common\$D\zstream.obj
 
 MSWOBJS = ..\msw\$D\accel.obj \


@@ -212,8 +252,10 @@ 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\dib.obj \
                ..\msw\$D\dibutils.obj \

+               ..\msw\$D\dir.obj \

                ..\msw\$D\dirdlg.obj \
                ..\msw\$D\dragimag.obj \
                ..\msw\ole\$D\dropsrc.obj \
                ..\msw\$D\dirdlg.obj \
                ..\msw\$D\dragimag.obj \
                ..\msw\ole\$D\dropsrc.obj \


@@ -221,13 +263,16 @@ MSWOBJS = ..\msw\$D\accel.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\gdiimage.obj \

                ..\msw\$D\gdiobj.obj \
                ..\msw\$D\gdiobj.obj \

+               ..\msw\$D\gsocket.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 \

-               ..\msw\$D\iniconf.obj \

                ..\msw\$D\joystick.obj \
                ..\msw\$D\listbox.obj \
                ..\msw\$D\listctrl.obj \
                ..\msw\$D\joystick.obj \
                ..\msw\$D\listbox.obj \
                ..\msw\$D\listctrl.obj \


@@ -245,7 +290,6 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\palette.obj \
                ..\msw\$D\pen.obj \
                ..\msw\$D\penwin.obj \
                ..\msw\$D\palette.obj \
                ..\msw\$D\pen.obj \
                ..\msw\$D\penwin.obj \

-               ..\msw\$D\pnghand.obj \

                ..\msw\$D\printdlg.obj \
                ..\msw\$D\printwin.obj \
                ..\msw\$D\radiobox.obj \
                ..\msw\$D\printdlg.obj \
                ..\msw\$D\printwin.obj \
                ..\msw\$D\radiobox.obj \


@@ -257,6 +301,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\settings.obj \
                ..\msw\$D\slider95.obj \
                ..\msw\$D\spinbutt.obj \
                ..\msw\$D\settings.obj \
                ..\msw\$D\slider95.obj \
                ..\msw\$D\spinbutt.obj \

+               ..\msw\$D\spinctrl.obj \

                ..\msw\$D\statbmp.obj \
                ..\msw\$D\statbox.obj \
                ..\msw\$D\statbr95.obj \
                ..\msw\$D\statbmp.obj \
                ..\msw\$D\statbox.obj \
                ..\msw\$D\statbr95.obj \


@@ -277,31 +322,33 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\window.obj \
                ..\msw\$D\xpmhand.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_dflist.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
 
 # Normal, static library

-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)

 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 


@@ -383,11 +430,11 @@ $(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

-    $(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
+    $(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

 <<
 
 !endif
 <<
 
 !endif


@@ -436,7 +483,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:


@@ -446,7 +493,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:


@@ -456,7 +503,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:


@@ -464,9 +511,19 @@ clean_jpeg:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 

+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+

 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:


@@ -479,14 +536,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 clean_tiff

         -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


@@ -504,41 +561,34 @@ 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
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf
 alldocs: docs
 
 cleanall: clean
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf
 alldocs: docs

-hlp:    wxhlp portinghlp
+hlp:    wxhlp

 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp

-prophlp: $(DOCDIR)/winhelp/prop.hlp

 refhlp: $(DOCDIR)/winhelp/techref.hlp
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 refhlp: $(DOCDIR)/winhelp/techref.hlp
 rtf:    $(DOCDIR)/winhelp/wx.rtf

-proprtf: $(DOCDIR)/winhelp/prop.rtf

 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf

-proppdfrtf: $(DOCDIR)/pdf/prop.rtf

 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf

-html:  wxhtml portinghtml
+html:  wxhtml

 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm

-prophtml: $(DOCDIR)\html\proplist\prop.htm

 ps:     wxps referencps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 ps:     wxps referencps
 wxps:  $(WXDIR)\docs\ps\wx.ps

-propps:        $(WXDIR)\docs\ps\prop.ps

 referencps:    $(WXDIR)\docs\ps\referenc.ps
 
 referencps:    $(WXDIR)\docs\ps\referenc.ps
 

-portinghtml: $(DOCDIR)\html\porting\port.htm
-portingrtf: $(DOCDIR)/winhelp/porting.rtf
-portinghlp: $(DOCDIR)/winhelp/porting.hlp
-portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
-portingps:     $(WXDIR)\docs\ps\porting.ps
-
-allhlp: wxhlp portinghlp prophlp
+allhlp: wxhlp

         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
         cd $(THISDIR)
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
         cd $(THISDIR)


@@ -558,7 +608,7 @@ allhlp: wxhlp portinghlp prophlp
 #        cd $(WXDIR)\utils\wxgrid\src
 #        nmake -f makefile.vc hlp
 
 #        cd $(WXDIR)\utils\wxgrid\src
 #        nmake -f makefile.vc hlp
 

-allhtml: wxhtml portinghtml prophtml
+allhtml: wxhtml

         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
         cd $(THISDIR)
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
         cd $(THISDIR)


@@ -579,12 +629,12 @@ allhtml: wxhtml portinghtml prophtml
 #        cd $(WXDIR)\utils\wxtree\src
 #        nmake -f makefile.vc html
 
 #        cd $(WXDIR)\utils\wxtree\src
 #        nmake -f makefile.vc html
 

-allps: wxps referencps portingps propps
+allps: wxps referencps

         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
         cd $(THISDIR)
 
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc ps
         cd $(THISDIR)
 

-allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
+allpdfrtf: pdfrtf

         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
         cd $(THISDIR)


@@ -609,22 +659,6 @@ $(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/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
-        cd $(DOCDIR)/latex/porting
-        -erase porting.ph
-        hc porting
-        move porting.hlp $(DOCDIR)\winhelp\porting.hlp
-        move porting.cnt $(DOCDIR)\winhelp\porting.cnt
-        cd $(THISDIR)
-
-$(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
-        cd $(DOCDIR)/latex/proplist
-        -erase prop.ph
-        hc prop
-        move prop.hlp $(DOCDIR)\winhelp\prop.hlp
-        move prop.cnt $(DOCDIR)\winhelp\prop.cnt
-        cd $(THISDIR)
-

 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
         -erase techref.ph
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
         -erase techref.ph


@@ -638,16 +672,6 @@ $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/late
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 

-$(DOCDIR)/latex/porting/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
-        cd $(DOCDIR)\latex\porting
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)/latex/proplist/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/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.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
 $(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


@@ -655,25 +679,15 @@ $(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)
 
         -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
-        -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
-        -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
 $(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)
 


@@ -692,27 +706,6 @@ $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
        -hhc wx.hhp
        cd $(THISDIR)
 
        -hhc wx.hhp
        cd $(THISDIR)
 

-
-$(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
-        cd $(DOCDIR)\latex\porting
-        -mkdir $(DOCDIR)\html\porting
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-        -erase $(DOCDIR)\html\porting\*.con
-        -erase $(DOCDIR)\html\porting\*.ref
-        -erase $(DOCDIR)\latex\porting\*.con
-        -erase $(DOCDIR)\latex\porting\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
-        cd $(DOCDIR)\latex\proplist
-        -mkdir $(DOCDIR)\html\proplist
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
-        -erase $(DOCDIR)\html\proplist\*.con
-        -erase $(DOCDIR)\html\proplist\*.ref
-        -erase $(DOCDIR)\latex\proplist\*.con
-        -erase $(DOCDIR)\latex\proplist\*.ref
-        cd $(THISDIR)
-

 $(WXDIR)\docs\latex\wx\manual.dvi:     $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
        cd $(WXDIR)\docs\latex\wx
         -latex manual
 $(WXDIR)\docs\latex\wx\manual.dvi:     $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
        cd $(WXDIR)\docs\latex\wx
         -latex manual


@@ -723,28 +716,12 @@ $(WXDIR)\docs\latex\wx\manual.dvi:        $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/w
         -latex manual
         cd $(THISDIR)
 
         -latex manual
         cd $(THISDIR)
 

-$(WXDIR)\docs\latex\porting\porting.dvi:       $(DOCDIR)/latex/porting/porting.tex
-       cd $(WXDIR)\docs\latex\porting
-        -latex porting
-        -latex porting
-        -makeindx porting
-        -bibtex porting
-        -latex porting
-        -latex porting
-        cd $(THISDIR)
-

 $(WXDIR)\docs\ps\wx.ps:        $(WXDIR)\docs\latex\wx\manual.dvi
        cd $(WXDIR)\docs\latex\wx
         -dvips32 -o wx.ps manual
         move wx.ps $(WXDIR)\docs\ps\wx.ps
         cd $(THISDIR)
 
 $(WXDIR)\docs\ps\wx.ps:        $(WXDIR)\docs\latex\wx\manual.dvi
        cd $(WXDIR)\docs\latex\wx
         -dvips32 -o wx.ps manual
         move wx.ps $(WXDIR)\docs\ps\wx.ps
         cd $(THISDIR)
 

-$(WXDIR)\docs\ps\porting.ps:   $(WXDIR)\docs\latex\porting\porting.dvi
-       cd $(WXDIR)\docs\latex\porting
-        -dvips32 -o porting.ps porting
-        move porting.ps $(WXDIR)\docs\ps\porting.ps
-        cd $(THISDIR)
-

 $(WXDIR)\docs\latex\wx\referenc.dvi:   $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
        cd $(WXDIR)\docs\latex\wx
         -latex referenc
 $(WXDIR)\docs\latex\wx\referenc.dvi:   $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
        cd $(WXDIR)\docs\latex\wx
         -latex referenc


@@ -772,3 +749,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
+