wxWindow::GetBestSize() added

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1daf224332ea80660b42713c827aacb6281d46a7..92897f90728078fd1184ec09bccf91e64faef1e6 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:03, 1999/09/29
+# This file was automatically generated by tmake at 14:24, 1999/11/15
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -85,7 +85,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\choicdgg.obj \
-               ..\generic\$D\gridg.obj \
+               ..\generic\$D\grid.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
@@ -111,6 +111,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.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 \
@@ -125,16 +126,20 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 
 COMMONOBJS = \
                ..\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\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\dobjcmn.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\fontmap.obj \
                ..\common\$D\framecmn.obj \
                ..\common\$D\fs_inet.obj \
                ..\common\$D\fs_zip.obj \
@@ -156,6 +162,7 @@ COMMONOBJS = \
                ..\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 \
@@ -166,9 +173,11 @@ COMMONOBJS = \
                ..\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\menucmn.obj \
                ..\common\$D\mimetype.obj \
                ..\common\$D\module.obj \
                ..\common\$D\mstream.obj \
@@ -248,6 +257,8 @@ MSWOBJS = ..\msw\$D\accel.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\gdiobj.obj \
@@ -284,6 +295,7 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -304,25 +316,25 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\window.obj \
                ..\msw\$D\xpmhand.obj
 
-HTMLOBJS = \
-  ..\html\$D\helpdata.obj \
-  ..\html\$D\helpfrm.obj \
-  ..\html\$D\helpctrl.obj \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.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
@@ -411,7 +423,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 <<
 
 # 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
@@ -464,7 +476,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 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:
@@ -474,7 +486,7 @@ clean_png:
 
 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:
@@ -484,7 +496,7 @@ clean_zlib:
 
 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:
@@ -494,7 +506,7 @@ clean_jpeg:
 
 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:
@@ -507,7 +519,7 @@ rcparser:
     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