X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d9b77552eeb78e0c7ee903aa265dc187651ff57..135ce19c6765c1163b63071ed84443da989cac7a:/src/msw/makefile.dos diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 7847cd8b64..916ace01b2 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 20:12, 1999/12/29 +# This file was automatically generated by tmake at 19:28, 2000/09/10 # 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 @@ -60,8 +60,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,6 +72,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 \ @@ -76,13 +80,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 @@ -91,20 +98,26 @@ COMMONOBJS1 = \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ + $(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 \ $(COMMDIR)\dobjcmn.obj \ $(COMMDIR)\docmdi.obj \ $(COMMDIR)\docview.obj \ $(COMMDIR)\dynarray.obj \ $(COMMDIR)\dynlib.obj \ + $(COMMDIR)\effects.obj \ + $(COMMDIR)\encconv.obj \ $(COMMDIR)\event.obj \ $(COMMDIR)\extended.obj \ $(COMMDIR)\ffile.obj \ @@ -116,8 +129,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 \ @@ -131,6 +146,7 @@ COMMONOBJS1 = \ $(COMMDIR)\lboxcmn.obj \ $(COMMDIR)\list.obj \ $(COMMDIR)\log.obj \ + $(COMMDIR)\longlong.obj \ $(COMMDIR)\memory.obj \ $(COMMDIR)\menucmn.obj \ $(COMMDIR)\module.obj \ @@ -142,6 +158,7 @@ COMMONOBJS1 = \ COMMONOBJS2 = \ $(COMMDIR)\paper.obj \ $(COMMDIR)\prntbase.obj \ + $(COMMDIR)\quantize.obj \ $(COMMDIR)\resource.obj \ $(COMMDIR)\serbase.obj \ $(COMMDIR)\sizer.obj \ @@ -153,6 +170,7 @@ COMMONOBJS2 = \ $(COMMDIR)\textfile.obj \ $(COMMDIR)\timercmn.obj \ $(COMMDIR)\tokenzr.obj \ + $(COMMDIR)\treebase.obj \ $(COMMDIR)\txtstrm.obj \ $(COMMDIR)\unzip.obj \ $(COMMDIR)\utilscmn.obj \ @@ -207,7 +225,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 \ @@ -520,11 +540,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) @@ -740,6 +770,11 @@ $(COMMDIR)/clipcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/cmdline.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/cmndata.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -750,6 +785,11 @@ $(COMMDIR)/config.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/cshelp.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/ctrlcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -760,6 +800,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) @@ -785,6 +830,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) @@ -810,6 +860,16 @@ $(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) +<< + $(COMMDIR)/event.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -865,6 +925,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) @@ -875,6 +940,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) @@ -940,6 +1010,11 @@ $(COMMDIR)/log.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/longlong.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/memory.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -985,6 +1060,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) @@ -1040,6 +1120,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) @@ -1120,16 +1205,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) @@ -1165,6 +1265,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) @@ -1200,6 +1305,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) @@ -1230,7 +1340,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) << @@ -1257,6 +1377,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)