added missing include mdi.h

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 98c73f44d2b5055f4a1345ac4f195277986c1fbf..970f6796260244575133f06938a48043419b20d6 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:31, 2000/01/19
+# This file was automatically generated by tmake at 18:32, 2000/02/17
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -26,7 +26,7 @@ DUMMYOBJ=dummy.obj
 # This one overrides the others, to be consistent with the settings in wx_setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
-USE_XPM_IN_MSW=0
+USE_XPM_IN_MSW=1
 USE_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
@@ -43,7 +43,7 @@ PERIPH_CLEAN_TARGET=
 # !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
@@ -84,6 +84,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\textdlgg.obj \
                $(GENDIR)\tipdlg.obj \
                $(GENDIR)\treectrl.obj \
+               $(GENDIR)\treelay.obj \
                $(GENDIR)\wizard.obj
 
 # we can't have all objects in one list because the library becomes too big
@@ -97,11 +98,13 @@ COMMONOBJS1 = \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
+               $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
                $(COMMDIR)\dlgcmn.obj \
+               $(COMMDIR)\dndcmn.obj \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
@@ -119,8 +122,10 @@ COMMONOBJS1 = \
                $(COMMDIR)\fontmap.obj \
                $(COMMDIR)\framecmn.obj \
                $(COMMDIR)\fs_inet.obj \
+               $(COMMDIR)\fs_mem.obj \
                $(COMMDIR)\fs_zip.obj \
                $(COMMDIR)\gdicmn.obj \
+               $(COMMDIR)\geometry.obj \
                $(COMMDIR)\gifdecod.obj \
                $(COMMDIR)\hash.obj \
                $(COMMDIR)\helpbase.obj \
@@ -222,7 +227,6 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\menuitem.obj \
                $(MSWDIR)\metafile.obj \
-               $(MSWDIR)\mimetype.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
@@ -580,11 +584,6 @@ $(MSWDIR)/metafile.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/mimetype.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/minifram.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -775,6 +774,11 @@ $(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/datetime.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -800,6 +804,11 @@ $(COMMDIR)/dlgcmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/dndcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dobjcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -885,6 +894,11 @@ $(COMMDIR)/fs_inet.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/fs_mem.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/fs_zip.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -895,6 +909,11 @@ $(COMMDIR)/gdicmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/geometry.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/gifdecod.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1287,6 +1306,8 @@ $(OBJECTS):       $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
+$(WXDIR)\lib\xpm.lib: xpm
+
 xpm:
     cd $(WXDIR)\src\xpm
     nmake -f makefile.dos FINAL=$(FINAL)