From 2e8b69c74893bb2256e444fb358c74f3c0c50b2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 1 Jan 2002 23:14:52 +0000 Subject: [PATCH] regenerated makefiles (forgot to do it after changing filelist.txt... so much for advantages of having everything in the CVS...) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/files.lst | 2 +- src/gtk1/files.lst | 2 +- src/mac/carbon/files.lst | 2 +- src/mac/files.lst | 2 +- src/mgl/files.lst | 2 +- src/mgl/makefile.wat | 12 ++++++------ src/motif/files.lst | 2 +- src/msw/files.lst | 3 +-- src/msw/makefile.b32 | 5 ++++- src/msw/makefile.bcc | 5 ++++- src/msw/makefile.dos | 8 +++++++- src/msw/makefile.g95 | 3 ++- src/msw/makefile.sc | 3 ++- src/msw/makefile.vc | 3 ++- src/msw/makefile.wat | 6 +++++- src/univ/files.lst | 2 +- src/wxUniv.dsp | 4 ++++ src/wxWindows.dsp | 8 ++++---- 18 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/gtk/files.lst b/src/gtk/files.lst index de848a9bb9..56976ed921 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 12:56, 2001/12/31 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index de848a9bb9..56976ed921 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 12:56, 2001/12/31 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index e975979285..bb7f362cf3 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 18:50, 2001/12/31 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T! ALL_SOURCES = \ generic/busyinfo.cpp \ diff --git a/src/mac/files.lst b/src/mac/files.lst index e975979285..bb7f362cf3 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 18:50, 2001/12/31 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T! ALL_SOURCES = \ generic/busyinfo.cpp \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index a77a985913..8b7852197b 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 12:56, 2001/12/31 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MGL.T! ALL_SOURCES = \ generic/accel.cpp \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 1c6346aac2..db53c875e3 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -89,6 +89,7 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + bmpbase.obj & choiccmn.obj & clipcmn.obj & clntdata.obj & @@ -209,8 +210,7 @@ COMMONOBJS = & wxexpr.obj & xpmdecod.obj & zipstrm.obj & - zstream.obj & - bmpbase.obj + zstream.obj MGLOBJS = app.obj & bitmap.obj & @@ -514,6 +514,9 @@ win32.obj: $(UNIVTHEMEDIR)\win32.cpp appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +bmpbase.obj: $(COMMDIR)\bmpbase.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + choiccmn.obj: $(COMMDIR)\choiccmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -877,9 +880,6 @@ zipstrm.obj: $(COMMDIR)\zipstrm.cpp zstream.obj: $(COMMDIR)\zstream.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -bmpbase.obj: $(COMMDIR)\bmpbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c diff --git a/src/motif/files.lst b/src/motif/files.lst index 3e5509e5bd..f6d70b8bc8 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 31f4e5e841..854d6abc8e 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -576,7 +576,6 @@ ALL_HEADERS = \ msw/region.h \ msw/registry.h \ msw/scrolbar.h \ - msw/settings.h \ msw/setup0.h \ msw/slider95.h \ msw/slidrmsw.h \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 1f1764bde2..badf46127d 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -116,6 +116,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\appcmn.obj \ + $(MSWDIR)\bmpbase.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ $(MSWDIR)\clntdata.obj \ @@ -636,6 +637,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(MSWDIR)\bmpbase.obj: $(COMMDIR)\bmpbase.$(SRCSUFF) + $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 89ef56d89b..8a036285a1 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -106,6 +106,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\appcmn.obj \ + $(MSWDIR)\bmpbase.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ $(MSWDIR)\clntdata.obj \ @@ -504,6 +505,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(MSWDIR)\bmpbase.obj: $(COMMDIR)\bmpbase.$(SRCSUFF) + $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index abeec3f4c6..34c1471ba4 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -90,6 +90,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ COMMONOBJS1 = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\appcmn.obj \ + $(COMMDIR)\bmpbase.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ $(COMMDIR)\clntdata.obj \ @@ -784,6 +785,11 @@ $(COMMDIR)/appcmn.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/bmpbase.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/choiccmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index c815cf36a3..5846f0a9d1 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -103,6 +103,7 @@ GENERICOBJS = \ COMMONOBJS = \ $(COMMDIR)/y_tab.$(OBJSUFF) \ $(COMMDIR)/appcmn.$(OBJSUFF) \ + $(COMMDIR)/bmpbase.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ $(COMMDIR)/clntdata.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 652cec59a4..b82487b1d1 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -59,6 +59,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ COMMONOBJS = \ $(COMMDIR)\y_tab.obj \ $(COMMDIR)\appcmn.obj \ + $(COMMDIR)\bmpbase.obj \ $(COMMDIR)\choiccmn.obj \ $(COMMDIR)\clipcmn.obj \ $(COMMDIR)\clntdata.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 5b4066495b..26414d4a3a 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -138,6 +138,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ COMMONOBJS = \ $(COMMDIR)\$D\y_tab.obj \ $(COMMDIR)\$D\appcmn.obj \ + $(COMMDIR)\$D\bmpbase.obj \ $(COMMDIR)\$D\choiccmn.obj \ $(COMMDIR)\$D\clipcmn.obj \ $(COMMDIR)\$D\clntdata.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 3f4afd0c56..961a4ab24b 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 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -97,6 +97,7 @@ NONESSENTIALOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + bmpbase.obj & choiccmn.obj & clipcmn.obj & clntdata.obj & @@ -724,6 +725,9 @@ window.obj: $(MSWDIR)\window.cpp appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +bmpbase.obj: $(COMMDIR)\bmpbase.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + choiccmn.obj: $(COMMDIR)\choiccmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/univ/files.lst b/src/univ/files.lst index c8b10beeaf..d21229af78 100644 --- a/src/univ/files.lst +++ b/src/univ/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:19, 2001/12/15 +# This file was automatically generated by tmake at 22:59, 2002/01/01 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T! UNIVOBJS = \ bmpbuttn.o \ diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 9900f04e26..70986a9985 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -89,6 +89,10 @@ SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\bmpbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index e2ae91032a..87bdde9c82 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -252,6 +252,10 @@ SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\bmpbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -2659,10 +2663,6 @@ SOURCE=..\include\wx\msw\scrolbar.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\settings.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\slider95.h # End Source File # Begin Source File -- 2.45.2