added new project file having the new files

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 9ec73748f32071304bfd4d3870e840652b7cfdb7..b5d6fab7b2922e2c7c5db7786deb062a6150b9d2 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:26, 2001/04/29
+# This file was automatically generated by tmake at 20:55, 2001/07/13
 # 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=1
 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)\lib\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)
@@ -64,6 +56,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\dirdlgg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
+               $(GENDIR)\gridctrl.obj \
                $(GENDIR)\gridsel.obj \
                $(GENDIR)\imaglist.obj \
                $(GENDIR)\laywin.obj \
@@ -78,7 +71,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\propform.obj \
                $(GENDIR)\proplist.obj \
                $(GENDIR)\sashwin.obj \
-               $(GENDIR)\scrolwin.obj \
+               $(GENDIR)\scrlwing.obj \
+               $(GENDIR)\spinctlg.obj \
                $(GENDIR)\splash.obj \
                $(GENDIR)\splitter.obj \
                $(GENDIR)\statusbr.obj \
@@ -98,6 +92,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
                $(COMMDIR)\cmdline.obj \
+               $(COMMDIR)\cmdproc.obj \
                $(COMMDIR)\cmndata.obj \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\cshelp.obj \
@@ -106,6 +101,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\dcbase.obj \
+               $(COMMDIR)\dircmn.obj \
                $(COMMDIR)\dlgcmn.obj \
                $(COMMDIR)\dndcmn.obj \
                $(COMMDIR)\dobjcmn.obj \
@@ -129,6 +125,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\fs_inet.obj \
                $(COMMDIR)\fs_mem.obj \
                $(COMMDIR)\fs_zip.obj \
+               $(COMMDIR)\gaugecmn.obj \
                $(COMMDIR)\gdicmn.obj \
                $(COMMDIR)\geometry.obj \
                $(COMMDIR)\gifdecod.obj \
@@ -138,6 +135,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\imagbmp.obj \
                $(COMMDIR)\image.obj \
                $(COMMDIR)\imaggif.obj \
+               $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
@@ -150,20 +148,25 @@ COMMONOBJS1 = \
                $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
+               $(COMMDIR)\nbkbase.obj \
                $(COMMDIR)\object.obj \
                $(COMMDIR)\objstrm.obj \
                $(COMMDIR)\odbc.obj
 
 COMMONOBJS2 = \
                $(COMMDIR)\paper.obj \
+               $(COMMDIR)\popupcmn.obj \
                $(COMMDIR)\prntbase.obj \
                $(COMMDIR)\quantize.obj \
+               $(COMMDIR)\radiocmn.obj \
+               $(COMMDIR)\regex.obj \
                $(COMMDIR)\resource.obj \
                $(COMMDIR)\serbase.obj \
                $(COMMDIR)\sizer.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
+               $(COMMDIR)\sysopt.obj \
                $(COMMDIR)\tbarbase.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
@@ -216,6 +219,7 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dibutils.obj \
                $(MSWDIR)\dir.obj \
                $(MSWDIR)\dragimag.obj \
+               $(MSWDIR)\evtloop.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -254,6 +258,7 @@ MSWOBJS2 = $(MSWDIR)\palette.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slidrmsw.obj \
+               $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
                $(MSWDIR)\statbmp.obj \
@@ -268,12 +273,7 @@ MSWOBJS2 = $(MSWDIR)\palette.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)
 
@@ -496,6 +496,11 @@ $(MSWDIR)/dragimag.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/evtloop.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/filedlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -681,6 +686,11 @@ $(MSWDIR)/slidrmsw.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/snglinst.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/spinbutt.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -756,11 +766,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)
@@ -781,6 +786,11 @@ $(COMMDIR)/cmdline.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/cmdproc.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/cmndata.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -821,6 +831,11 @@ $(COMMDIR)/dcbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/dircmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dlgcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -936,6 +951,11 @@ $(COMMDIR)/fs_zip.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/gaugecmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/gdicmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -981,6 +1001,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)
@@ -1041,6 +1066,11 @@ $(COMMDIR)/mstream.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/nbkbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/object.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1061,6 +1091,11 @@ $(COMMDIR)/paper.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/popupcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/prntbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1071,6 +1106,16 @@ $(COMMDIR)/quantize.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/radiocmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/regex.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1101,6 +1146,11 @@ $(COMMDIR)/string.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/sysopt.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/tbarbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1236,6 +1286,11 @@ $(GENDIR)/grid.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/gridctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/gridsel.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1306,7 +1361,12 @@ $(GENDIR)/sashwin.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
+$(GENDIR)/scrlwing.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(GENDIR)/spinctlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -1383,18 +1443,6 @@ $(OBJECTS):      $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
-$(WXDIR)\lib\xpm.lib: xpm
-
-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)