Documented help API extension and fixed gsocket compilation.

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 7cdcfa176649550575f14724103d6fbe4b1a94f5..3ff4d9c34d85445ff1cd2d3f7b7e5018b60b1de0 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 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -62,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 $<
@@ -82,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 \
@@ -90,6 +92,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.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\tipdlg.obj
@@ -106,11 +109,9 @@ NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
                ..\generic\$D\notebook.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
-               ..\generic\$D\statusbr.obj \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
-               ..\common\$D\extended.obj \
                ..\common\$D\y_tab.obj \
                ..\common\$D\cmndata.obj \
                ..\common\$D\config.obj \
@@ -125,6 +126,8 @@ COMMONOBJS = \
                ..\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 \
@@ -161,14 +164,13 @@ 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 \
                ..\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 \
@@ -190,7 +192,7 @@ COMMONOBJS = \
 
 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 \
@@ -207,7 +209,7 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -219,20 +221,20 @@ MSWOBJS = ..\msw\$D\accel.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\frame.obj \
                ..\msw\$D\gauge95.obj \
-               ..\msw\$D\gaugemsw.obj \
                ..\msw\$D\gdiobj.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\listctrl.obj \
                ..\msw\$D\main.obj \
                ..\msw\$D\mdi.obj \
                ..\msw\$D\menu.obj \
@@ -241,7 +243,8 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -257,7 +260,6 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\scrolbar.obj \
                ..\msw\$D\settings.obj \
                ..\msw\$D\slider95.obj \
-               ..\msw\$D\slidrmsw.obj \
                ..\msw\$D\spinbutt.obj \
                ..\msw\$D\statbmp.obj \
                ..\msw\$D\statbox.obj \
@@ -267,14 +269,14 @@ MSWOBJS = ..\msw\$D\accel.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\treectrl.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
@@ -300,7 +302,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)
@@ -416,11 +418,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
 
-..\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$@
@@ -779,3 +776,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
+