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 875c0a3c5cabb49d1788431af7b31ee368930d0d..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 19:06, 2000/01/05
+# 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
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects


@@ -34,6 +34,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\logg.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \
                $(GENDIR)\logg.obj \
                $(GENDIR)\numdlgg.obj \
                $(GENDIR)\panelg.obj \

+               $(GENDIR)\plot.obj \

                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\prop.obj \
                $(GENDIR)\propform.obj \
                $(GENDIR)\progdlgg.obj \
                $(GENDIR)\prop.obj \
                $(GENDIR)\propform.obj \


@@ -105,7 +106,7 @@ COMMONOBJS = \
                $(COMMDIR)\longlong.obj \
                $(COMMDIR)\memory.obj \
                $(COMMDIR)\menucmn.obj \
                $(COMMDIR)\longlong.obj \
                $(COMMDIR)\memory.obj \
                $(COMMDIR)\menucmn.obj \

-               $(COMMDIR)\mimetype.obj \
+               $(COMMDIR)\mimecmn.obj \

                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\object.obj \
                $(COMMDIR)\module.obj \
                $(COMMDIR)\mstream.obj \
                $(COMMDIR)\object.obj \


@@ -181,6 +182,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\ole\dropsrc.obj \
                $(MSWDIR)\ole\droptgt.obj \
                $(MSWDIR)\dragimag.obj \
                $(MSWDIR)\ole\dropsrc.obj \
                $(MSWDIR)\ole\droptgt.obj \

+               $(MSWDIR)\enhmeta.obj \

                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \
                $(MSWDIR)\filedlg.obj \
                $(MSWDIR)\font.obj \
                $(MSWDIR)\fontdlg.obj \


@@ -201,6 +203,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\menuitem.obj \
                $(MSWDIR)\metafile.obj \
                $(MSWDIR)\menu.obj \
                $(MSWDIR)\menuitem.obj \
                $(MSWDIR)\metafile.obj \

+               $(MSWDIR)\mimetype.obj \

                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \
                $(MSWDIR)\minifram.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\nativdlg.obj \