From a5f0148111ab0391dcf736346dc893d907c51190 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 24 May 2003 20:23:12 +0000 Subject: [PATCH] Removed obsoleted files from vc.t. Regenerated some makefiles/project files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc.t | 7 ------- src/mgl/makefile.wat | 4 ---- src/microwin/files.lst | 4 ---- src/msw/makefile.b32 | 3 --- src/msw/makefile.sc | 6 ++++-- src/msw/makefile.vc | 1 - src/msw/makefile.wat | 1 - src/wxUniv.dsp | 12 ------------ src/wxWindows.dsp | 8 -------- 9 files changed, 4 insertions(+), 42 deletions(-) diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 427c27cb1c..541cbe2df2 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -152,7 +152,6 @@ GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); NONESSENTIALOBJS= #$ ExpandList("WXNONESSENTIALOBJS"); COMMONOBJS = \ - $(COMMDIR)\$D\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); @@ -322,9 +321,6 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp -<< - cl @<< -$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp @@ -340,9 +336,6 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp -<< - cl @<< -$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 4a121b3f4a..67141010f2 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -58,7 +58,6 @@ GENERICOBJS= accel.obj & gridctrl.obj & gridsel.obj & helpext.obj & - helphtml.obj & imaglist.obj & laywin.obj & listctrl.obj & @@ -1002,9 +1001,6 @@ gridsel.obj: $(GENDIR)\gridsel.cpp helpext.obj: $(GENDIR)\helpext.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -helphtml.obj: $(GENDIR)\helphtml.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - imaglist.obj: $(GENDIR)\imaglist.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 9efe841a1c..ed7428f662 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -18,7 +18,6 @@ ALL_SOURCES = \ generic/gridctrl.cpp \ generic/gridsel.cpp \ generic/helpext.cpp \ - generic/helphtml.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -330,7 +329,6 @@ ALL_HEADERS = \ hashmap.h \ help.h \ helpbase.h \ - helphtml.h \ helpwin.h \ icon.h \ iconbndl.h \ @@ -576,7 +574,6 @@ ALL_HEADERS = \ generic/gridctrl.h \ generic/gridg.h \ generic/helpext.h \ - generic/helphtml.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -777,7 +774,6 @@ GENERICOBJS = \ gridctrl.o \ gridsel.o \ helpext.o \ - helphtml.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 7583a0ee30..6fe260580a 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -227,7 +227,6 @@ GENERICUNIVOBJS= $(MSWDIR)\accel.obj \ $(MSWDIR)\gridctrl.obj \ $(MSWDIR)\gridsel.obj \ $(MSWDIR)\helpext.obj \ - $(MSWDIR)\helphtml.obj \ $(MSWDIR)\imaglist.obj \ $(MSWDIR)\laywin.obj \ $(MSWDIR)\listctrl.obj \ @@ -1318,8 +1317,6 @@ $(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF) $(MSWDIR)\helpext.obj: $(GENDIR)\helpext.$(SRCSUFF) -$(MSWDIR)\helphtml.obj: $(GENDIR)\helphtml.$(SRCSUFF) - $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF) $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF) diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index f82064a06f..b69656843c 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -3,7 +3,9 @@ # This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! -# Symantec C++ makefile for the msw objects +# Digital mars makefile +# was Symantec C++ makefile for the msw objects +# # called from src\makefile.sc # configuration section (see src\makefile.sc) ########################### @@ -347,7 +349,7 @@ clean_msw: -del $(GENDIR)\*.obj -del $(HTMLDIR)\*.obj -del *.obj - -del *.sym + -del *.sym -del ole\*.obj -del $(LIBTARGET) diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 5e9e1dc6e4..c53425c153 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -123,7 +123,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\filedlgg.obj \ $(GENDIR)\$D\fontdlgg.obj \ $(GENDIR)\$D\helpext.obj \ - $(GENDIR)\$D\helphtml.obj \ $(GENDIR)\$D\imaglist.obj \ $(GENDIR)\$D\listctrl.obj \ $(GENDIR)\$D\mdig.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 09456951c3..f761301802 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -63,7 +63,6 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj & $(OUTPUTDIR)\filedlgg.obj & $(OUTPUTDIR)\fontdlgg.obj & $(OUTPUTDIR)\helpext.obj & - $(OUTPUTDIR)\helphtml.obj & $(OUTPUTDIR)\imaglist.obj & $(OUTPUTDIR)\listctrl.obj & $(OUTPUTDIR)\mdig.obj & diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 5a06666a79..b6d098b94f 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -689,10 +689,6 @@ SOURCE=.\generic\helpext.cpp # End Source File # Begin Source File -SOURCE=.\generic\helphtml.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\imaglist.cpp # End Source File # Begin Source File @@ -1715,10 +1711,6 @@ SOURCE=..\include\wx\helpbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\helpwin.h # End Source File # Begin Source File @@ -2332,10 +2324,6 @@ SOURCE=..\include\wx\generic\helpext.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 6663e0a38f..41d4392788 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1908,10 +1908,6 @@ SOURCE=..\include\wx\helpbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\helpwin.h # End Source File # Begin Source File @@ -2890,10 +2886,6 @@ SOURCE=..\include\wx\generic\helpext.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File -- 2.45.2