X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9abe166a3073d9e9ceb0110429a45adc6517d76f..d3cc7c6521c909b5d8be2b9fcff96442a8d2f6c8:/src/msw/makefile.dos diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 1e399a6ab1..970f679626 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,6 +1,4 @@ - - -# This file was automatically generated by tmake at 17:32, 1999/10/18 +# This file was automatically generated by tmake at 18:32, 2000/02/17 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -28,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" @@ -45,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,6 +58,7 @@ OLEDIR=.\ole MSWDIR=. GENERICOBJS= $(GENDIR)\busyinfo.obj \ + $(GENDIR)\calctrl.obj \ $(GENDIR)\choicdgg.obj \ $(GENDIR)\dirdlgg.obj \ $(GENDIR)\grid.obj \ @@ -70,6 +69,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 \ @@ -80,28 +80,37 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\splitter.obj \ $(GENDIR)\statusbr.obj \ $(GENDIR)\tabg.obj \ + $(GENDIR)\tbarsmpl.obj \ $(GENDIR)\textdlgg.obj \ $(GENDIR)\tipdlg.obj \ $(GENDIR)\treectrl.obj \ + $(GENDIR)\treelay.obj \ $(GENDIR)\wizard.obj -COMMONOBJS = \ +# we can't have all objects in one list because the library becomes too big +COMMONOBJS1 = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\choiccmn.obj \ + $(COMMDIR)\clipcmn.obj \ + $(COMMDIR)\cmdline.obj \ $(COMMDIR)\cmndata.obj \ $(COMMDIR)\config.obj \ $(COMMDIR)\ctrlcmn.obj \ - $(COMMDIR)\date.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)\encconv.obj \ $(COMMDIR)\event.obj \ $(COMMDIR)\extended.obj \ $(COMMDIR)\ffile.obj \ @@ -110,10 +119,13 @@ COMMONOBJS = \ $(COMMDIR)\filefn.obj \ $(COMMDIR)\filesys.obj \ $(COMMDIR)\fontcmn.obj \ + $(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 \ @@ -124,14 +136,19 @@ COMMONOBJS = \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ $(COMMDIR)\layout.obj \ + $(COMMDIR)\lboxcmn.obj \ $(COMMDIR)\list.obj \ $(COMMDIR)\log.obj \ + $(COMMDIR)\longlong.obj \ $(COMMDIR)\memory.obj \ + $(COMMDIR)\menucmn.obj \ $(COMMDIR)\module.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\object.obj \ $(COMMDIR)\objstrm.obj \ - $(COMMDIR)\odbc.obj \ + $(COMMDIR)\odbc.obj + +COMMONOBJS2 = \ $(COMMDIR)\paper.obj \ $(COMMDIR)\prntbase.obj \ $(COMMDIR)\resource.obj \ @@ -141,10 +158,8 @@ COMMONOBJS = \ $(COMMDIR)\stream.obj \ $(COMMDIR)\string.obj \ $(COMMDIR)\tbarbase.obj \ - $(COMMDIR)\tbarsmpl.obj \ $(COMMDIR)\textcmn.obj \ $(COMMDIR)\textfile.obj \ - $(COMMDIR)\time.obj \ $(COMMDIR)\timercmn.obj \ $(COMMDIR)\tokenzr.obj \ $(COMMDIR)\txtstrm.obj \ @@ -161,7 +176,8 @@ COMMONOBJS = \ $(COMMDIR)\zipstrm.obj \ $(COMMDIR)\zstream.obj -MSWOBJS = $(MSWDIR)\accel.obj \ +# we can't have all objects in one list because the library becomes too big +MSWOBJS1 = $(MSWDIR)\accel.obj \ $(MSWDIR)\app.obj \ $(MSWDIR)\bitmap.obj \ $(MSWDIR)\bmpbuttn.obj \ @@ -186,14 +202,19 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\dcscreen.obj \ $(MSWDIR)\dde.obj \ $(MSWDIR)\dialog.obj \ + $(MSWDIR)\dialup.obj \ $(MSWDIR)\dib.obj \ $(MSWDIR)\dibutils.obj \ + $(MSWDIR)\dir.obj \ $(MSWDIR)\dragimag.obj \ $(MSWDIR)\filedlg.obj \ $(MSWDIR)\font.obj \ $(MSWDIR)\fontdlg.obj \ + $(MSWDIR)\fontenum.obj \ + $(MSWDIR)\fontutil.obj \ $(MSWDIR)\frame.obj \ $(MSWDIR)\gaugemsw.obj \ + $(MSWDIR)\gdiimage.obj \ $(MSWDIR)\gdiobj.obj \ $(MSWDIR)\gsocket.obj \ $(MSWDIR)\helpwin.obj \ @@ -209,8 +230,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ - $(MSWDIR)\ownerdrw.obj \ - $(MSWDIR)\palette.obj \ + $(MSWDIR)\ownerdrw.obj + +MSWOBJS2 = $(MSWDIR)\palette.obj \ $(MSWDIR)\pen.obj \ $(MSWDIR)\penwin.obj \ $(MSWDIR)\printdlg.obj \ @@ -241,48 +263,57 @@ MSWOBJS = $(MSWDIR)\accel.obj \ # $(OLEDIR)\xpmhand \ # $(OLEDIR)\pnghand \ -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2) # Normal, static library -all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib - - -# $(WXDIR)\lib\wx.lib: dummy.obj $(OBJECTS) $(PERIPH_LIBS) -# -erase $(LIBTARGET) -# lib /PAGESIZE:128 @<< -# $(LIBTARGET) -# y -# $(OBJECTS) $(PERIPH_LIBS) -# nul -# ; -# << +all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib -$(WXDIR)\lib\wx1.lib: $(COMMONOBJS) $(PERIPH_LIBS) +$(WXDIR)\lib\wx1.lib: $(COMMONOBJS1) $(PERIPH_LIBS) -erase $(WXDIR)\lib\wx1.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx1.lib y -$(COMMONOBJS) $(PERIPH_LIBS) +$(COMMONOBJS1) $(PERIPH_LIBS) nul ; << -$(WXDIR)\lib\wx2.lib: $(GENERICOBJS) +$(WXDIR)\lib\wx2.lib: $(COMMONOBJS2) -erase $(WXDIR)\lib\wx2.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx2.lib y -$(GENERICOBJS) +$(COMMONOBJS2) nul ; << -$(WXDIR)\lib\wx3.lib: $(MSWOBJS) +$(WXDIR)\lib\wx3.lib: $(GENERICOBJS) -erase $(WXDIR)\lib\wx3.lib lib /PAGESIZE:128 @<< $(WXDIR)\lib\wx3.lib y -$(MSWOBJS) +$(GENERICOBJS) +nul +; +<< + +$(WXDIR)\lib\wx4.lib: $(MSWOBJS1) + -erase $(WXDIR)\lib\wx4.lib + lib /PAGESIZE:128 @<< +$(WXDIR)\lib\wx4.lib +y +$(MSWOBJS1) +nul +; +<< + +$(WXDIR)\lib\wx5.lib: $(MSWOBJS2) + -erase $(WXDIR)\lib\wx5.lib + lib /PAGESIZE:128 @<< +$(WXDIR)\lib\wx5.lib +y +$(MSWOBJS2) nul ; << @@ -428,6 +459,11 @@ $(MSWDIR)/dialog.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/dialup.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/dib.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -438,6 +474,11 @@ $(MSWDIR)/dibutils.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/dir.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/dragimag.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -458,6 +499,16 @@ $(MSWDIR)/fontdlg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/fontenum.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + +$(MSWDIR)/fontutil.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/frame.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -468,16 +519,21 @@ $(MSWDIR)/gaugemsw.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(MSWDIR)/gdiobj.obj: $*.$(SRCSUFF) +$(MSWDIR)/gdiimage.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(MSWDIR)/gsocket.obj: $*.$(SRCSUFF) +$(MSWDIR)/gdiobj.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/gsocket.obj: $*.c + cl @<< +$(CPPFLAGS2) /Fo$@ /c /Tc $*.c +<< + $(MSWDIR)/helpwin.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -688,6 +744,16 @@ $(COMMDIR)/choiccmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/clipcmn.obj: $*.$(SRCSUFF) + cl @<< +$(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) @@ -703,7 +769,12 @@ $(COMMDIR)/ctrlcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/date.obj: $*.$(SRCSUFF) +$(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + +$(COMMDIR)/datetime.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << @@ -733,6 +804,16 @@ $(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) +<< + $(COMMDIR)/docmdi.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -753,6 +834,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) @@ -793,6 +879,11 @@ $(COMMDIR)/fontcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/fontmap.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/framecmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -803,6 +894,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) @@ -813,6 +909,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) @@ -863,6 +964,11 @@ $(COMMDIR)/layout.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/lboxcmn.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/list.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -873,11 +979,21 @@ $(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) << +$(COMMDIR)/menucmn.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/module.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -948,11 +1064,6 @@ $(COMMDIR)/tbarbase.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/tbarsmpl.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(COMMDIR)/textcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -963,11 +1074,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) @@ -1048,6 +1154,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) @@ -1098,6 +1209,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) @@ -1148,6 +1264,11 @@ $(GENDIR)/tabg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(GENDIR)/tbarsmpl.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(GENDIR)/textdlgg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1185,6 +1306,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)