X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf84b0be84321486b6e9d67f610fa3d623987112..e1208c3103734c8581c9854c344b97323e381897:/src/msw/makefile.dos diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 93fe174b99..07a1334b3c 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 19:00, 1999/12/14 +# This file was automatically generated by tmake at 15:56, 2000/02/29 # 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 @@ -58,8 +58,10 @@ OLEDIR=.\ole MSWDIR=. GENERICOBJS= $(GENDIR)\busyinfo.obj \ + $(GENDIR)\calctrl.obj \ $(GENDIR)\choicdgg.obj \ $(GENDIR)\dirdlgg.obj \ + $(GENDIR)\dragimgg.obj \ $(GENDIR)\grid.obj \ $(GENDIR)\imaglist.obj \ $(GENDIR)\laywin.obj \ @@ -68,6 +70,7 @@ 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 \ @@ -82,6 +85,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 @@ -90,22 +94,24 @@ COMMONOBJS1 = \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ + $(COMMDIR)\cmdline.obj \ $(COMMDIR)\cmndata.obj \ $(COMMDIR)\config.obj \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ - $(COMMDIR)\date.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 \ $(COMMDIR)\dynarray.obj \ $(COMMDIR)\dynlib.obj \ + $(COMMDIR)\encconv.obj \ $(COMMDIR)\event.obj \ $(COMMDIR)\extended.obj \ $(COMMDIR)\ffile.obj \ @@ -117,8 +123,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 \ @@ -153,7 +161,6 @@ COMMONOBJS2 = \ $(COMMDIR)\tbarbase.obj \ $(COMMDIR)\textcmn.obj \ $(COMMDIR)\textfile.obj \ - $(COMMDIR)\time.obj \ $(COMMDIR)\timercmn.obj \ $(COMMDIR)\tokenzr.obj \ $(COMMDIR)\txtstrm.obj \ @@ -210,6 +217,7 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \ $(MSWDIR)\gaugemsw.obj \ $(MSWDIR)\gdiimage.obj \ $(MSWDIR)\gdiobj.obj \ + $(MSWDIR)\glcanvas.obj \ $(MSWDIR)\gsocket.obj \ $(MSWDIR)\helpwin.obj \ $(MSWDIR)\icon.obj \ @@ -523,6 +531,11 @@ $(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 @@ -743,27 +756,27 @@ $(COMMDIR)/clipcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/cmndata.obj: $*.$(SRCSUFF) +$(COMMDIR)/cmdline.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/config.obj: $*.$(SRCSUFF) +$(COMMDIR)/cmndata.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/ctrlcmn.obj: $*.$(SRCSUFF) +$(COMMDIR)/config.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF) +$(COMMDIR)/ctrlcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/date.obj: $*.$(SRCSUFF) +$(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << @@ -798,6 +811,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) @@ -823,6 +841,11 @@ $(COMMDIR)/dynlib.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/encconv.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/event.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -878,6 +901,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) @@ -888,6 +916,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) @@ -1048,11 +1081,6 @@ $(COMMDIR)/textfile.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/time.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(COMMDIR)/timercmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1133,6 +1161,11 @@ $(GENDIR)/busyinfo.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(GENDIR)/calctrl.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(GENDIR)/choicdgg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1143,6 +1176,11 @@ $(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) @@ -1183,6 +1221,11 @@ $(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) @@ -1253,6 +1296,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) @@ -1275,6 +1323,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)