X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d541a0366ec3611fd3cfac46e70b52f64652fac..ee284519e408d285fd5e416f5de214fd31fd8417:/src/msw/makefile.dos

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 98c73f44d2..afd69682d1 100644
--- 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 15:55, 2000/03/14
 # 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
@@ -61,7 +61,9 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\calctrl.obj \
 		$(GENDIR)\choicdgg.obj \
 		$(GENDIR)\dirdlgg.obj \
+		$(GENDIR)\dragimgg.obj \
 		$(GENDIR)\grid.obj \
+		$(GENDIR)\gridsel.obj \
 		$(GENDIR)\imaglist.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\listctrl.obj \
@@ -84,6 +86,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 +100,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 +124,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 \
@@ -211,7 +218,9 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\gaugemsw.obj \
 		$(MSWDIR)\gdiimage.obj \
 		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\glcanvas.obj \
 		$(MSWDIR)\gsocket.obj \
+		$(MSWDIR)\gsockmsw.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\iniconf.obj \
@@ -222,7 +231,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 \
@@ -525,11 +533,21 @@ $(MSWDIR)/gdiobj.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/glcanvas.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/gsocket.obj:     $*.c
         cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
+$(MSWDIR)/gsockmsw.obj:     $*.c
+        cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
+<<
+
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -580,11 +598,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 +788,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 +818,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 +908,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 +923,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)
@@ -1150,11 +1183,21 @@ $(GENDIR)/dirdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/dragimgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/grid.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/gridsel.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/imaglist.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1265,6 +1308,11 @@ $(GENDIR)/treectrl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/treelay.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/wizard.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1287,6 +1335,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)