wxButton::GetDefaultSize() fix

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 2148e8be8621161995f44f572fc32ea6411f209a..34d6bf1caf77a31f4837455ee8f331d90e3c1f83 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 09:32, 1999/08/04
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -58,6 +58,11 @@ $(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 $<
@@ -78,6 +83,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\extdlgg.obj \
                ..\generic\$D\gridg.obj \
                ..\generic\$D\laywin.obj \
+               ..\generic\$D\numdlgg.obj \
                ..\generic\$D\panelg.obj \
                ..\generic\$D\progdlgg.obj \
                ..\generic\$D\prop.obj \
@@ -93,7 +99,8 @@ GENERICOBJS= ..\generic\$D\busyinfo.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= ..\generic\$D\colrdlgg.obj \
+NONESSENTIALOBJS= ..\generic\$D\caret.obj \
+               ..\generic\$D\colrdlgg.obj \
                ..\generic\$D\dirdlgg.obj \
                ..\generic\$D\fontdlgg.obj \
                ..\generic\$D\helpxlp.obj \
@@ -107,8 +114,10 @@ NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
 
 COMMONOBJS = \
                ..\common\$D\y_tab.obj \
+               ..\common\$D\choiccmn.obj \
                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \
+               ..\common\$D\ctrlcmn.obj \
                ..\common\$D\date.obj \
                ..\common\$D\datstrm.obj \
                ..\common\$D\db.obj \
@@ -158,7 +167,6 @@ COMMONOBJS = \
                ..\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\socket.obj \
@@ -227,7 +235,6 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -298,7 +305,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) 
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -482,11 +489,11 @@ rcparser:
 clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
         -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
@@ -772,3 +779,10 @@ updatedocs: touchmanual alldocs
 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
+