1. corrected (but the fix is ugly) the multiple def button problem

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

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 815b4ba22d9034ad1399491347fbe322641c5da4..5e26611f21d7d56041c26168b0212e1853708d0f 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:33, 1999/10/23
+# This file was automatically generated by tmake at 00:24, 1999/10/28
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -144,6 +144,7 @@ COMMONOBJS = \
                $(MSWDIR)\list.obj \
                $(MSWDIR)\log.obj \
                $(MSWDIR)\memory.obj \
+               $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\object.obj \
@@ -269,8 +270,6 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 +$(PERIPH_LIBS:.lib =.lib +)
 !
 
-#+$(OBJECTS:.obj =.obj +)
-
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 
@@ -531,6 +530,8 @@ $(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
 $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
+$(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF)
+
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
@@ -597,6 +598,8 @@ $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 ${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
 
+
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)