Catching up to latest thread changes

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 40705836c49a20b3bb0d72ad83a9290fb411df13..760110149b6a6c26e5cc9a0c25fe856a03f8cfb4 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 23:29, 1999/10/08
+# 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


@@ -111,6 +111,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\dirdlgg.obj \
                ..\generic\$D\filedlgg.obj \
                ..\generic\$D\fontdlgg.obj \
                ..\generic\$D\dirdlgg.obj \
                ..\generic\$D\filedlgg.obj \
                ..\generic\$D\fontdlgg.obj \

+               ..\generic\$D\helpext.obj \

                ..\generic\$D\helphtml.obj \
                ..\generic\$D\helpwxht.obj \
                ..\generic\$D\helpxlp.obj \
                ..\generic\$D\helphtml.obj \
                ..\generic\$D\helpwxht.obj \
                ..\generic\$D\helpxlp.obj \


@@ -125,16 +126,20 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \

+               ..\common\$D\appcmn.obj \

                ..\common\$D\choiccmn.obj \
                ..\common\$D\choiccmn.obj \

+               ..\common\$D\clipcmn.obj \

                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \
                ..\common\$D\ctrlcmn.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\docmdi.obj \
                ..\common\$D\docview.obj \
                ..\common\$D\dynarray.obj \


@@ -147,6 +152,7 @@ COMMONOBJS = \
                ..\common\$D\filefn.obj \
                ..\common\$D\filesys.obj \
                ..\common\$D\fontcmn.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\framecmn.obj \
                ..\common\$D\fs_inet.obj \
                ..\common\$D\fs_zip.obj \


@@ -167,9 +173,11 @@ COMMONOBJS = \
                ..\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 \


@@ -240,6 +248,7 @@ 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\dib.obj \
                ..\msw\$D\dibutils.obj \
                ..\msw\$D\dirdlg.obj \


@@ -249,8 +258,11 @@ 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\gsocket.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\gdiobj.obj \
                ..\msw\$D\gsocket.obj \
                ..\msw\$D\helpwin.obj \


@@ -285,6 +297,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 \


@@ -313,6 +326,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
                ..\html\$D\htmlpars.obj \
                ..\html\$D\htmltag.obj \
                ..\html\$D\htmlwin.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_fonts.obj \
                ..\html\$D\m_hline.obj \
                ..\html\$D\m_image.obj \


@@ -321,7 +335,6 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
                ..\html\$D\m_list.obj \
                ..\html\$D\m_pre.obj \
                ..\html\$D\m_tables.obj \
                ..\html\$D\m_list.obj \
                ..\html\$D\m_pre.obj \
                ..\html\$D\m_tables.obj \

-               ..\html\$D\search.obj \

                ..\html\$D\winpars.obj
 
 
                ..\html\$D\winpars.obj
 
 


@@ -508,7 +521,7 @@ 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 ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll