X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c692969f820a2b34ea319d4f61f2dacc228a5b66..69231000be8d209bb8ea1f6aaa1ff665a270e351:/src/msw/makefile.dos

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 536db8d0b5..f2247e551d 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 00:44, 2001/05/09
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -26,12 +26,10 @@ 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_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
 USE_CTL3D=0
-USE_XPM_IN_MSW=0
 !endif
 
 PERIPH_LIBS=
@@ -42,12 +40,6 @@ PERIPH_CLEAN_TARGET=
 # PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
 # !endif
 
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
 # PNG and Zlib
 PERIPH_TARGET=png zlib $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
@@ -60,8 +52,11 @@ MSWDIR=.
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\calctrl.obj \
 		$(GENDIR)\choicdgg.obj \
+		$(GENDIR)\dirctrlg.obj \
 		$(GENDIR)\dirdlgg.obj \
+		$(GENDIR)\dragimgg.obj \
 		$(GENDIR)\grid.obj \
+		$(GENDIR)\gridsel.obj \
 		$(GENDIR)\imaglist.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\listctrl.obj \
@@ -69,7 +64,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\notebook.obj \
 		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
-		$(GENDIR)\plot.obj \
 		$(GENDIR)\prntdlgg.obj \
 		$(GENDIR)\progdlgg.obj \
 		$(GENDIR)\prop.obj \
@@ -77,13 +71,16 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\proplist.obj \
 		$(GENDIR)\sashwin.obj \
 		$(GENDIR)\scrolwin.obj \
+		$(GENDIR)\splash.obj \
 		$(GENDIR)\splitter.obj \
 		$(GENDIR)\statusbr.obj \
 		$(GENDIR)\tabg.obj \
 		$(GENDIR)\tbarsmpl.obj \
 		$(GENDIR)\textdlgg.obj \
 		$(GENDIR)\tipdlg.obj \
-		$(GENDIR)\treectrl.obj \
+		$(GENDIR)\tipwin.obj \
+		$(GENDIR)\treectlg.obj \
+		$(GENDIR)\treelay.obj \
 		$(GENDIR)\wizard.obj
 
 # we can't have all objects in one list because the library becomes too big
@@ -95,12 +92,11 @@ COMMONOBJS1 = \
 		$(COMMDIR)\cmdline.obj \
 		$(COMMDIR)\cmndata.obj \
 		$(COMMDIR)\config.obj \
+		$(COMMDIR)\cshelp.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 \
@@ -109,6 +105,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\docview.obj \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
+		$(COMMDIR)\effects.obj \
 		$(COMMDIR)\encconv.obj \
 		$(COMMDIR)\event.obj \
 		$(COMMDIR)\extended.obj \
@@ -116,6 +113,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
 		$(COMMDIR)\filefn.obj \
+		$(COMMDIR)\filename.obj \
 		$(COMMDIR)\filesys.obj \
 		$(COMMDIR)\fontcmn.obj \
 		$(COMMDIR)\fontmap.obj \
@@ -132,6 +130,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\imagbmp.obj \
 		$(COMMDIR)\image.obj \
 		$(COMMDIR)\imaggif.obj \
+		$(COMMDIR)\imagxpm.obj \
 		$(COMMDIR)\intl.obj \
 		$(COMMDIR)\ipcbase.obj \
 		$(COMMDIR)\layout.obj \
@@ -139,6 +138,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\list.obj \
 		$(COMMDIR)\log.obj \
 		$(COMMDIR)\longlong.obj \
+		$(COMMDIR)\matrix.obj \
 		$(COMMDIR)\memory.obj \
 		$(COMMDIR)\menucmn.obj \
 		$(COMMDIR)\module.obj \
@@ -150,6 +150,7 @@ COMMONOBJS1 = \
 COMMONOBJS2 = \
 		$(COMMDIR)\paper.obj \
 		$(COMMDIR)\prntbase.obj \
+		$(COMMDIR)\quantize.obj \
 		$(COMMDIR)\resource.obj \
 		$(COMMDIR)\serbase.obj \
 		$(COMMDIR)\sizer.obj \
@@ -161,6 +162,7 @@ COMMONOBJS2 = \
 		$(COMMDIR)\textfile.obj \
 		$(COMMDIR)\timercmn.obj \
 		$(COMMDIR)\tokenzr.obj \
+		$(COMMDIR)\treebase.obj \
 		$(COMMDIR)\txtstrm.obj \
 		$(COMMDIR)\unzip.obj \
 		$(COMMDIR)\utilscmn.obj \
@@ -172,6 +174,7 @@ COMMONOBJS2 = \
 		$(COMMDIR)\wincmn.obj \
 		$(COMMDIR)\wxchar.obj \
 		$(COMMDIR)\wxexpr.obj \
+		$(COMMDIR)\xpmdecod.obj \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj
 
@@ -215,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 \
@@ -251,16 +256,12 @@ MSWOBJS2 = $(MSWDIR)\palette.obj \
 		$(MSWDIR)\tabctrl.obj \
 		$(MSWDIR)\tbarmsw.obj \
 		$(MSWDIR)\textctrl.obj \
+		$(MSWDIR)\tglbtn.obj \
 		$(MSWDIR)\timer.obj \
 		$(MSWDIR)\utils.obj \
 		$(MSWDIR)\utilsexc.obj \
 		$(MSWDIR)\wave.obj \
-		$(MSWDIR)\window.obj \
-		$(MSWDIR)\xpmhand.obj
-
-# TODO: Implement XPM and PNG targets in this makefile!
-#  $(OLEDIR)\xpmhand \
-#  $(OLEDIR)\pnghand \
+		$(MSWDIR)\window.obj
 
 OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 
@@ -528,11 +529,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)
@@ -703,6 +714,11 @@ $(MSWDIR)/textctrl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/tglbtn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/timer.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -728,11 +744,6 @@ $(MSWDIR)/window.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/xpmhand.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/appcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -763,32 +774,27 @@ $(COMMDIR)/config.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/ctrlcmn.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/cshelp.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/datetime.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/ctrlcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/db.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/datetime.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/dbtable.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -833,6 +839,11 @@ $(COMMDIR)/dynlib.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/effects.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/encconv.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -868,6 +879,11 @@ $(COMMDIR)/filefn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/filename.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/filesys.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -948,6 +964,11 @@ $(COMMDIR)/imaggif.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/imagxpm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/intl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -983,6 +1004,11 @@ $(COMMDIR)/longlong.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/memory.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1028,6 +1054,11 @@ $(COMMDIR)/prntbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/quantize.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1083,6 +1114,11 @@ $(COMMDIR)/tokenzr.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/treebase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/txtstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1138,6 +1174,11 @@ $(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/xpmdecod.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/zipstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1163,16 +1204,31 @@ $(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/dirctrlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/dirdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(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)
@@ -1208,11 +1264,6 @@ $(GENDIR)/panelg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/plot.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1248,6 +1299,11 @@ $(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/splash.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/splitter.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1278,7 +1334,17 @@ $(GENDIR)/tipdlg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/treectrl.obj:     $*.$(SRCSUFF)
+$(GENDIR)/tipwin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(GENDIR)/treectlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(GENDIR)/treelay.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -1305,16 +1371,6 @@ $(OBJECTS):	$(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos FINAL=$(FINAL)
-    cd $(WXDIR)\src\msw
-
-clean_xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos clean
-    cd $(WXDIR)\src\msw
-
 zlib:
     cd $(WXDIR)\src\zlib
     nmake -f makefile.dos FINAL=$(FINAL)