Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / makefile.sc

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 7cff1ea421e431d9d482c02b56bfaddb4b1ac66e..79432d9f40b5a8f69daff78bc3b6219bb6a11eee 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# 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
@@ -27,12 +27,14 @@ OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
+               $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
                $(GENDIR)\grid.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\logg.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
+               $(GENDIR)\plot.obj \
                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\prop.obj \
                $(GENDIR)\propform.obj \
@@ -51,11 +53,11 @@ COMMONOBJS = \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\choiccmn.obj \
                $(COMMDIR)\clipcmn.obj \
+               $(COMMDIR)\cmdline.obj \
                $(COMMDIR)\cmndata.obj \
                $(COMMDIR)\config.obj \
                $(COMMDIR)\ctrlcmn.obj \
                $(COMMDIR)\ctrlsub.obj \
-               $(COMMDIR)\date.obj \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\db.obj \
@@ -67,6 +69,7 @@ COMMONOBJS = \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
+               $(COMMDIR)\encconv.obj \
                $(COMMDIR)\event.obj \
                $(COMMDIR)\extended.obj \
                $(COMMDIR)\ffile.obj \
@@ -103,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 \
@@ -127,7 +130,6 @@ COMMONOBJS = \
                $(COMMDIR)\tbarbase.obj \
                $(COMMDIR)\textcmn.obj \
                $(COMMDIR)\textfile.obj \
-               $(COMMDIR)\time.obj \
                $(COMMDIR)\timercmn.obj \
                $(COMMDIR)\tokenzr.obj \
                $(COMMDIR)\txtstrm.obj \
@@ -180,6 +182,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\ole\dropsrc.obj \
                $(MSWDIR)\ole\droptgt.obj \
+               $(MSWDIR)\enhmeta.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
@@ -200,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 \