From dc0e23b8fb35c8b0e527594f96fa91c57a067b3a Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 24 Jul 2002 19:46:48 +0000 Subject: [PATCH] Updated Makefiles for all but Motif; there is either a lock or a CVS problem. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/files.lst | 5 +++++ src/gtk/files.lst | 4 ++++ src/gtk1/files.lst | 4 ++++ src/mac/carbon/files.lst | 4 ++++ src/mac/files.lst | 4 ++++ src/mgl/files.lst | 5 +++++ src/microwin/files.lst | 5 +++++ src/msw/files.lst | 5 +++++ src/msw/makefile.b32 | 3 +++ src/msw/makefile.bcc | 3 +++ src/msw/makefile.dos | 6 ++++++ src/msw/makefile.g95 | 1 + src/msw/makefile.sc | 1 + src/msw/makefile.vc | 1 + src/msw/makefile.wat | 4 ++++ src/os2/files.lst | 8 ++++++++ src/univ/files.lst | 6 +++--- src/wxBase.dsp | 8 ++++++++ src/wxUniv.dsp | 33 ++++++++++++++++++++------------- src/wxWindows.dsp | 8 ++++++++ src/x11/files.lst | 5 +++++ 21 files changed, 107 insertions(+), 16 deletions(-) diff --git a/src/files.lst b/src/files.lst index 1a97f58f2b..5819cb2fb6 100644 --- a/src/files.lst +++ b/src/files.lst @@ -39,6 +39,7 @@ ALL_SOURCES = \ common/memory.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/object.cpp \ common/process.cpp \ @@ -90,6 +91,7 @@ ALL_HEADERS = \ app.h \ arrimpl.cpp \ buffer.h \ + build.h \ chkconf.h \ clntdata.h \ cmdline.h \ @@ -140,6 +142,7 @@ ALL_HEADERS = \ memtext.h \ mimetype.h \ module.h \ + msgout.h \ mstream.h \ object.h \ platform.h \ @@ -157,6 +160,7 @@ ALL_HEADERS = \ textbuf.h \ textfile.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tokenzr.h \ @@ -222,6 +226,7 @@ BASE_OBJS = \ memory.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ object.o \ process.o \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 5cd0a0cefb..bd7a7ae117 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -129,6 +129,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -411,6 +412,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -471,6 +473,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -713,6 +716,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 5cd0a0cefb..bd7a7ae117 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -129,6 +129,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -411,6 +412,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -471,6 +473,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -713,6 +716,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 2b54942772..e8016fb792 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -126,6 +126,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -417,6 +418,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -477,6 +479,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -739,6 +742,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 2b54942772..e8016fb792 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -126,6 +126,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -417,6 +418,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -477,6 +479,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -739,6 +742,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 34ba0931ef..72a644fe41 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -129,6 +129,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -240,6 +241,7 @@ ALL_HEADERS = \ bmpbuttn.h \ brush.h \ buffer.h \ + build.h \ busyinfo.h \ button.h \ calctrl.h \ @@ -371,6 +373,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -431,6 +434,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -612,6 +616,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/microwin/files.lst b/src/microwin/files.lst index af59915286..89ef6907f7 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -126,6 +126,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -240,6 +241,7 @@ ALL_HEADERS = \ bmpbuttn.h \ brush.h \ buffer.h \ + build.h \ busyinfo.h \ button.h \ calctrl.h \ @@ -371,6 +373,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -431,6 +434,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -706,6 +710,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index aaa0fd29af..55c0c8ce9e 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -113,6 +113,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -434,6 +435,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -494,6 +496,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -777,6 +780,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ @@ -979,6 +983,7 @@ GUI_LOWLEVEL_OBJS = \ dcmemory.o \ dcprint.o \ dcscreen.o \ + dde.o \ dib.o \ evtloop.o \ font.o \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index e33b057446..d57aada93b 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -194,6 +194,7 @@ COMMONOBJS = \ $(MSWDIR)\menucmn.obj \ $(MSWDIR)\mimecmn.obj \ $(MSWDIR)\module.obj \ + $(MSWDIR)\msgout.obj \ $(MSWDIR)\mstream.obj \ $(MSWDIR)\nbkbase.obj \ $(MSWDIR)\object.obj \ @@ -829,6 +830,8 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF) $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF) +$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF) + $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF) $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index c54f5974fb..fd24a013db 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -176,6 +176,7 @@ COMMONOBJS = \ $(MSWDIR)\memory.obj \ $(MSWDIR)\menucmn.obj \ $(MSWDIR)\module.obj \ + $(MSWDIR)\msgout.obj \ $(MSWDIR)\mstream.obj \ $(MSWDIR)\nbkbase.obj \ $(MSWDIR)\object.obj \ @@ -659,6 +660,8 @@ $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF) $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF) +$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF) + $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF) $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index e4061a3b47..eaa572fa39 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -161,6 +161,7 @@ COMMONOBJS1 = \ $(COMMDIR)\memory.obj \ $(COMMDIR)\menucmn.obj \ $(COMMDIR)\module.obj \ + $(COMMDIR)\msgout.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\nbkbase.obj \ $(COMMDIR)\object.obj \ @@ -1161,6 +1162,11 @@ $(COMMDIR)/module.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/msgout.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/mstream.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 37cb09f520..1043e14499 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -149,6 +149,7 @@ COMMONOBJS_BASE = \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/mimecmn.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ + $(COMMDIR)/msgout.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ $(COMMDIR)/process.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 8345d38a92..7f9e09bd22 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -140,6 +140,7 @@ COMMONOBJS = \ $(COMMDIR)\menucmn.obj \ $(COMMDIR)\mimecmn.obj \ $(COMMDIR)\module.obj \ + $(COMMDIR)\msgout.obj \ $(COMMDIR)\mstream.obj \ $(COMMDIR)\nbkbase.obj \ $(COMMDIR)\object.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index b1fda75760..c4843def62 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -216,6 +216,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\menucmn.obj \ $(COMMDIR)\$D\mimecmn.obj \ $(COMMDIR)\$D\module.obj \ + $(COMMDIR)\$D\msgout.obj \ $(COMMDIR)\$D\mstream.obj \ $(COMMDIR)\$D\nbkbase.obj \ $(COMMDIR)\$D\object.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index c937bb2ea8..cef1a7df01 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -178,6 +178,7 @@ COMMONOBJS = & menucmn.obj & mimecmn.obj & module.obj & + msgout.obj & mstream.obj & nbkbase.obj & object.obj & @@ -985,6 +986,9 @@ mimecmn.obj: $(COMMDIR)\mimecmn.cpp module.obj: $(COMMDIR)\module.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +msgout.obj: $(COMMDIR)\msgout.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + mstream.obj: $(COMMDIR)\mstream.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/os2/files.lst b/src/os2/files.lst index e1d738c8f0..8ea0b72d6f 100644 --- a/src/os2/files.lst +++ b/src/os2/files.lst @@ -122,6 +122,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -138,6 +139,7 @@ ALL_SOURCES = \ common/sckfile.cpp \ common/sckipc.cpp \ common/sckstrm.cpp \ + common/settcmn.cpp \ common/sizer.cpp \ common/socket.cpp \ common/statbar.cpp \ @@ -278,6 +280,7 @@ ALL_HEADERS = \ bmpbuttn.h \ brush.h \ buffer.h \ + build.h \ busyinfo.h \ button.h \ calctrl.h \ @@ -384,6 +387,7 @@ ALL_HEADERS = \ imagxpm.h \ intl.h \ ioswrap.h \ + ipc.h \ ipcbase.h \ isql.h \ isqlext.h \ @@ -408,6 +412,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -468,6 +473,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -716,6 +722,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ @@ -732,6 +739,7 @@ COMMONOBJS = \ sckfile.o \ sckipc.o \ sckstrm.o \ + settcmn.o \ sizer.o \ socket.o \ statbar.o \ diff --git a/src/univ/files.lst b/src/univ/files.lst index 1fc4d723ba..93a1f55df3 100644 --- a/src/univ/files.lst +++ b/src/univ/files.lst @@ -12,12 +12,12 @@ UNIV_SOURCES = \ univ/dialog.cpp \ univ/framuniv.cpp \ univ/gauge.cpp \ - univ/themes/gtk.cpp \ + univ/gtk.cpp \ univ/inpcons.cpp \ univ/inphand.cpp \ univ/listbox.cpp \ univ/menu.cpp \ - univ/themes/metal.cpp \ + univ/metal.cpp \ univ/notebook.cpp \ univ/radiobox.cpp \ univ/radiobut.cpp \ @@ -36,7 +36,7 @@ UNIV_SOURCES = \ univ/theme.cpp \ univ/toolbar.cpp \ univ/topluniv.cpp \ - univ/themes/win32.cpp \ + univ/win32.cpp \ univ/winuniv.cpp UNIV_HEADERS = \ diff --git a/src/wxBase.dsp b/src/wxBase.dsp index f59799d71a..f6fe1f1ddc 100644 --- a/src/wxBase.dsp +++ b/src/wxBase.dsp @@ -393,6 +393,10 @@ SOURCE=.\common\module.cpp # End Source File # Begin Source File +SOURCE=.\common\msgout.cpp +# End Source File +# Begin Source File + SOURCE=.\common\mstream.cpp # End Source File # Begin Source File @@ -865,6 +869,10 @@ SOURCE=..\include\wx\module.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index fc30afbf25..a620d7ea6c 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -409,6 +409,10 @@ SOURCE=.\common\module.cpp # End Source File # Begin Source File +SOURCE=.\common\msgout.cpp +# End Source File +# Begin Source File + SOURCE=.\common\mstream.cpp # End Source File # Begin Source File @@ -1108,6 +1112,10 @@ SOURCE=.\univ\gauge.cpp # End Source File # Begin Source File +SOURCE=.\univ\gtk.cpp +# End Source File +# Begin Source File + SOURCE=.\univ\inpcons.cpp # End Source File # Begin Source File @@ -1124,6 +1132,10 @@ SOURCE=.\univ\menu.cpp # End Source File # Begin Source File +SOURCE=.\univ\metal.cpp +# End Source File +# Begin Source File + SOURCE=.\univ\notebook.cpp # End Source File # Begin Source File @@ -1196,25 +1208,16 @@ SOURCE=.\univ\topluniv.cpp # End Source File # Begin Source File -SOURCE=.\univ\winuniv.cpp -# End Source File - -# Begin Group "Theme Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\univ\themes\gtk.cpp +SOURCE=.\univ\win32.cpp # End Source File # Begin Source File -SOURCE=.\univ\themes\metal.cpp +SOURCE=.\univ\winuniv.cpp # End Source File -# Begin Source File -SOURCE=.\univ\themes\win32.cpp -# End Source File +# Begin Group "Theme Files" +# PROP Default_Filter "" # End Group # End Group # Begin Group "Headers" @@ -1802,6 +1805,10 @@ SOURCE=..\include\wx\msgdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 1dc1faea29..07d260cc58 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -568,6 +568,10 @@ SOURCE=.\common\module.cpp # End Source File # Begin Source File +SOURCE=.\common\msgout.cpp +# End Source File +# Begin Source File + SOURCE=.\common\mstream.cpp # End Source File # Begin Source File @@ -2082,6 +2086,10 @@ SOURCE=..\include\wx\msgdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File diff --git a/src/x11/files.lst b/src/x11/files.lst index 5bcedfd5ae..07a2a9955d 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -160,6 +160,7 @@ ALL_SOURCES = \ common/menucmn.cpp \ common/mimecmn.cpp \ common/module.cpp \ + common/msgout.cpp \ common/mstream.cpp \ common/nbkbase.cpp \ common/object.cpp \ @@ -249,6 +250,7 @@ ALL_HEADERS = \ bmpbuttn.h \ brush.h \ buffer.h \ + build.h \ busyinfo.h \ button.h \ calctrl.h \ @@ -380,6 +382,7 @@ ALL_HEADERS = \ minifram.h \ module.h \ msgdlg.h \ + msgout.h \ mstream.h \ notebook.h \ object.h \ @@ -440,6 +443,7 @@ ALL_HEADERS = \ textfile.h \ tglbtn.h \ thread.h \ + thrimpl.cpp \ time.h \ timer.h \ tipdlg.h \ @@ -726,6 +730,7 @@ COMMONOBJS = \ menucmn.o \ mimecmn.o \ module.o \ + msgout.o \ mstream.o \ nbkbase.o \ object.o \ -- 2.45.2