Applied a few old patches,

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 3b1d7fe0cdd75f33a89dfb1ec7b107c383749a5b..76899b1063917b5678de50eb5e2c13bcdbd44fbf 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:14, 1999/08/18
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -66,6 +66,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\imaglist.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\listctrl.obj \
+               $(GENDIR)\logg.obj \
                $(GENDIR)\notebook.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
@@ -101,11 +102,13 @@ COMMONOBJS = \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\event.obj \
+               $(COMMDIR)\extended.obj \
                $(COMMDIR)\ffile.obj \
                $(COMMDIR)\file.obj \
                $(COMMDIR)\fileconf.obj \
                $(COMMDIR)\filefn.obj \
                $(COMMDIR)\filesys.obj \
+               $(COMMDIR)\fontcmn.obj \
                $(COMMDIR)\framecmn.obj \
                $(COMMDIR)\fs_inet.obj \
                $(COMMDIR)\fs_zip.obj \
@@ -113,11 +116,10 @@ COMMONOBJS = \
                $(COMMDIR)\gifdecod.obj \
                $(COMMDIR)\hash.obj \
                $(COMMDIR)\helpbase.obj \
+               $(COMMDIR)\imagall.obj \
                $(COMMDIR)\imagbmp.obj \
                $(COMMDIR)\image.obj \
                $(COMMDIR)\imaggif.obj \
-               $(COMMDIR)\imagjpeg.obj \
-               $(COMMDIR)\imagpnm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
@@ -131,8 +133,8 @@ COMMONOBJS = \
                $(COMMDIR)\odbc.obj \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\prntbase.obj \
-               $(COMMDIR)\process.obj \
                $(COMMDIR)\resource.obj \
+               $(COMMDIR)\serbase.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
@@ -145,6 +147,7 @@ COMMONOBJS = \
                $(COMMDIR)\timercmn.obj \
                $(COMMDIR)\tokenzr.obj \
                $(COMMDIR)\txtstrm.obj \
+               $(COMMDIR)\unzip.obj \
                $(COMMDIR)\utilscmn.obj \
                $(COMMDIR)\valgen.obj \
                $(COMMDIR)\validate.obj \
@@ -155,14 +158,8 @@ COMMONOBJS = \
                $(COMMDIR)\wxchar.obj \
                $(COMMDIR)\wxexpr.obj \
                $(COMMDIR)\zipstrm.obj \
-               $(COMMDIR)\extended.obj \
-               $(COMMDIR)\unzip.obj \
                $(COMMDIR)\zstream.obj
 
-# Won't compile
-#              $(COMMDIR)\imagpng.obj \
-#
-
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
                $(MSWDIR)\bitmap.obj \
@@ -197,6 +194,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\frame.obj \
                $(MSWDIR)\gaugemsw.obj \
                $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\gsocket.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\iniconf.obj \
@@ -237,9 +235,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\window.obj \
                $(MSWDIR)\xpmhand.obj
 
-# Won't compile
-#              $(MSWDIR)\pnghand.obj \
-#
 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \
@@ -476,6 +471,11 @@ $(MSWDIR)/gdiobj.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/gsocket.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -561,11 +561,6 @@ $(MSWDIR)/penwin.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/pnghand.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/printdlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -781,6 +776,11 @@ $(COMMDIR)/filesys.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/fontcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/framecmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -816,32 +816,22 @@ $(COMMDIR)/helpbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/imagbmp.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/imagall.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/image.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/imaggif.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/imagjpeg.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/imagbmp.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/imagpng.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/image.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/imagpnm.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/imaggif.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -911,12 +901,12 @@ $(COMMDIR)/prntbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/process.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/serbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -1076,6 +1066,11 @@ $(GENDIR)/listctrl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/logg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/notebook.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)