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

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 427c27cb1cd6482be169855ff2e822c42b15fe1e..541cbe2df256a57949f19e395944827ad89c9e13 100644 (file)
--- 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 4a121b3f4a301d8c316675a38800514cf0c8116a..67141010f2733cb1422262f7f27eb556a9cc34c3 100644 (file)
--- 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 9efe841a1c2cc9fb11d434a767910a3441f6fe74..ed7428f662fbf5ee35269e59a636459b08747ccd 100644 (file)
--- 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 7583a0ee300a080ca9a068ed1a482d9f67d16163..6fe260580af741bbb5392977420217cfd7365268 100644 (file)
--- 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 f82064a06fb32e2d132f8fbeca16c405264c87d7..b69656843c4e7579248b92c540cc7bc9e201f5da 100644 (file)
--- 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 5e9e1dc6e44079e28041cb8ea2f6f717db712de0..c53425c153758f258f240f4977d4301278c3a015 100644 (file)
--- 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 09456951c314922e8c3e853ec78dbce05a2bb734..f761301802559e35c739230e019e6946e5a04622 100644 (file)
--- 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 5a06666a79ff99e853585c3388ffd47a814df675..b6d098b94fe02e581e28bf44bfdf53f7bf5b8777 100644 (file)
--- 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 6663e0a38fafae336ebb0cce45b84a012f4e3a4d..41d43927887d7606e83f8f4f328794423a35f39b 100644 (file)
--- 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