From 5d541a0366ec3611fd3cfac46e70b52f64652fac Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 19 Jan 2000 23:05:17 +0000 Subject: [PATCH] mimetype.cpp/.h split into unix,max,msw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 26 +++++++++++++++----------- src/msw/makefile.b32 | 12 +++++++++--- src/msw/makefile.bcc | 8 +++++++- src/msw/makefile.dos | 14 +++++++++++++- src/msw/makefile.g95 | 6 ++++-- src/msw/makefile.sc | 6 ++++-- src/msw/makefile.vc | 6 ++++-- src/msw/makefile.wat | 14 +++++++++++--- 8 files changed, 67 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index 897017bf3a..0ae70045b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 20:27, 2000/01/17 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -860,7 +860,7 @@ GTK_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -958,7 +958,7 @@ GTK_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -1258,7 +1258,7 @@ MOTIF_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -1356,7 +1356,7 @@ MOTIF_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -1612,7 +1612,7 @@ MSW_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -1711,7 +1711,7 @@ MSW_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -1805,6 +1805,7 @@ MSW_GUIOBJS = \ menu.o \ menuitem.o \ metafile.o \ + mimetype.o \ minifram.o \ msgdlg.o \ nativdlg.o \ @@ -1897,6 +1898,7 @@ MSW_GUIDEPS = \ menu.d \ menuitem.d \ metafile.d \ + mimetype.d \ minifram.d \ msgdlg.d \ nativdlg.d \ @@ -2066,7 +2068,7 @@ PM_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -2165,7 +2167,7 @@ PM_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -2378,7 +2380,7 @@ BASE_OBJS = \ list.o \ log.o \ longlong.o \ - mimetype.o \ + mimecmn.o \ module.o \ object.o \ process.o \ @@ -2417,7 +2419,7 @@ BASE_DEPS = \ list.d \ log.d \ longlong.d \ - mimetype.d \ + mimecmn.d \ module.d \ object.d \ process.d \ @@ -2486,6 +2488,7 @@ UNIX_OBJS = \ fontenum.o \ fontutil.o \ gsocket.o \ + mimetype.o \ threadpsx.o \ utilsunx.o @@ -2495,6 +2498,7 @@ UNIX_DEPS = \ fontenum.d \ fontutil.d \ gsocket.d \ + mimetype.d \ threadpsx.d \ utilsunx.d diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 278031b387..62c3bde3d2 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -86,6 +86,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\logg.obj \ $(MSWDIR)\numdlgg.obj \ $(MSWDIR)\panelg.obj \ + $(MSWDIR)\plot.obj \ $(MSWDIR)\progdlgg.obj \ $(MSWDIR)\prop.obj \ $(MSWDIR)\propform.obj \ @@ -168,7 +169,7 @@ COMMONOBJS = \ $(MSWDIR)\longlong.obj \ $(MSWDIR)\memory.obj \ $(MSWDIR)\menucmn.obj \ - $(MSWDIR)\mimetype.obj \ + $(MSWDIR)\mimecmn.obj \ $(MSWDIR)\module.obj \ $(MSWDIR)\mstream.obj \ $(MSWDIR)\object.obj \ @@ -265,6 +266,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\menu.obj \ $(MSWDIR)\menuitem.obj \ $(MSWDIR)\metafile.obj \ + $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ @@ -488,6 +490,8 @@ $(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF) $(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF) +$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) + $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF) @@ -685,7 +689,7 @@ $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF) $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF) -$(MSWDIR)\mimetype.obj: $(COMMDIR)\mimetype.$(SRCSUFF) +$(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF) $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF) @@ -787,6 +791,8 @@ $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF) +$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF) + $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 13a90af936..c8aa1c79f8 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -85,6 +85,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\notebook.obj \ $(MSWDIR)\numdlgg.obj \ $(MSWDIR)\panelg.obj \ + $(MSWDIR)\plot.obj \ $(MSWDIR)\progdlgg.obj \ $(MSWDIR)\prop.obj \ $(MSWDIR)\propform.obj \ @@ -232,6 +233,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\menu.obj \ $(MSWDIR)\menuitem.obj \ $(MSWDIR)\metafile.obj \ + $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ @@ -395,6 +397,8 @@ $(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF) $(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF) +$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) + $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF) @@ -648,6 +652,8 @@ $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF) $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF) +$(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF) + $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index c7520d1623..98c73f44d2 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -69,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 \ @@ -221,6 +222,7 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \ $(MSWDIR)\menu.obj \ $(MSWDIR)\menuitem.obj \ $(MSWDIR)\metafile.obj \ + $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ @@ -578,6 +580,11 @@ $(MSWDIR)/metafile.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/mimetype.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/minifram.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1183,6 +1190,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) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 1177936f28..85cb4710ba 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -77,6 +77,7 @@ GENERICOBJS = \ $(GENDIR)/logg.$(OBJSUFF) \ $(GENDIR)/numdlgg.$(OBJSUFF) \ $(GENDIR)/panelg.$(OBJSUFF) \ + $(GENDIR)/plot.$(OBJSUFF) \ $(GENDIR)/progdlgg.$(OBJSUFF) \ $(GENDIR)/prop.$(OBJSUFF) \ $(GENDIR)/propform.$(OBJSUFF) \ @@ -148,7 +149,7 @@ COMMONOBJS = \ $(COMMDIR)/longlong.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/menucmn.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ + $(COMMDIR)/mimecmn.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ @@ -263,6 +264,7 @@ MSWOBJS = \ $(MSWDIR)/menu.$(OBJSUFF) \ $(MSWDIR)/menuitem.$(OBJSUFF) \ $(MSWDIR)/metafile.$(OBJSUFF) \ + $(MSWDIR)/mimetype.$(OBJSUFF) \ $(MSWDIR)/minifram.$(OBJSUFF) \ $(MSWDIR)/msgdlg.$(OBJSUFF) \ $(MSWDIR)/nativdlg.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 686fc8307b..79432d9f40 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -34,6 +34,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\logg.obj \ $(GENDIR)\numdlgg.obj \ $(GENDIR)\panelg.obj \ + $(GENDIR)\plot.obj \ $(GENDIR)\progdlgg.obj \ $(GENDIR)\prop.obj \ $(GENDIR)\propform.obj \ @@ -105,7 +106,7 @@ COMMONOBJS = \ $(COMMDIR)\longlong.obj \ $(COMMDIR)\memory.obj \ $(COMMDIR)\menucmn.obj \ - $(COMMDIR)\mimetype.obj \ + $(COMMDIR)\mimecmn.obj \ $(COMMDIR)\module.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\object.obj \ @@ -202,6 +203,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\menu.obj \ $(MSWDIR)\menuitem.obj \ $(MSWDIR)\metafile.obj \ + $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ $(MSWDIR)\nativdlg.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 2ab1c2fff1..58344b50a9 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -91,6 +91,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\logg.obj \ ..\generic\$D\numdlgg.obj \ ..\generic\$D\panelg.obj \ + ..\generic\$D\plot.obj \ ..\generic\$D\progdlgg.obj \ ..\generic\$D\prop.obj \ ..\generic\$D\propform.obj \ @@ -184,7 +185,7 @@ COMMONOBJS = \ ..\common\$D\longlong.obj \ ..\common\$D\memory.obj \ ..\common\$D\menucmn.obj \ - ..\common\$D\mimetype.obj \ + ..\common\$D\mimecmn.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ ..\common\$D\object.obj \ @@ -282,6 +283,7 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\menu.obj \ ..\msw\$D\menuitem.obj \ ..\msw\$D\metafile.obj \ + ..\msw\$D\mimetype.obj \ ..\msw\$D\minifram.obj \ ..\msw\$D\msgdlg.obj \ ..\msw\$D\nativdlg.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index c487a6b480..62abd23ccf 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 21:14, 2000/01/16 +# This file was automatically generated by tmake at 14:31, 2000/01/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -47,6 +47,7 @@ GENERICOBJS= busyinfo.obj & logg.obj & numdlgg.obj & panelg.obj & + plot.obj & progdlgg.obj & prop.obj & propform.obj & @@ -139,7 +140,7 @@ COMMONOBJS = & longlong.obj & memory.obj & menucmn.obj & - mimetype.obj & + mimecmn.obj & module.obj & mstream.obj & object.obj & @@ -239,6 +240,7 @@ MSWOBJS = accel.obj & menu.obj & menuitem.obj & metafile.obj & + mimetype.obj & minifram.obj & msgdlg.obj & nativdlg.obj & @@ -484,6 +486,9 @@ menuitem.obj: $(MSWDIR)\menuitem.cpp metafile.obj: $(MSWDIR)\metafile.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +mimetype.obj: $(MSWDIR)\mimetype.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + minifram.obj: $(MSWDIR)\minifram.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -780,7 +785,7 @@ memory.obj: $(COMMDIR)\memory.cpp menucmn.obj: $(COMMDIR)\menucmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -mimetype.obj: $(COMMDIR)\mimetype.cpp +mimecmn.obj: $(COMMDIR)\mimecmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< module.obj: $(COMMDIR)\module.cpp @@ -941,6 +946,9 @@ numdlgg.obj: $(GENDIR)\numdlgg.cpp panelg.obj: $(GENDIR)\panelg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +plot.obj: $(GENDIR)\plot.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + progdlgg.obj: $(GENDIR)\progdlgg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -- 2.45.2