merged 2 overloaded functions into a single membersections

[wxWidgets.git] / src / common / descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 6e017756ee765bd8393fc2805a6e857b69382e90..68d8ee528a8debd3c85288eb0e161c24b3531ceb 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -99,6 +99,7 @@ OBJECTS1=fs_inet.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\

+               imagfill.obj,\

                imaggif.obj,\
                imagiff.obj,\
                imagjpeg.obj,\
                imaggif.obj,\
                imagiff.obj,\
                imagjpeg.obj,\


@@ -118,6 +119,7 @@ OBJECTS1=fs_inet.obj,\
                menucmn.obj,\
                mimecmn.obj,\
                module.obj,\
                menucmn.obj,\
                mimecmn.obj,\
                module.obj,\

+               msgout.obj,\

                mstream.obj,\
                nbkbase.obj,\
                object.obj,\
                mstream.obj,\
                nbkbase.obj,\
                object.obj,\


@@ -134,6 +136,7 @@ OBJECTS1=fs_inet.obj,\
                sckstrm.obj,\
                sizer.obj,\
                socket.obj,\
                sckstrm.obj,\
                sizer.obj,\
                socket.obj,\

+               settcmn.obj,\

                statbar.obj,\
                strconv.obj,\
                stream.obj,\
                statbar.obj,\
                strconv.obj,\
                stream.obj,\


@@ -164,11 +167,14 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.obj
 
                zipstrm.obj,\
                zstream.obj
 

+OBJECTS_MOTIF=bmpbase.obj
+

 SOURCES = \
                parser.y,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
 SOURCES = \
                parser.y,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\

+               bmpbase.cpp,\

                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\


@@ -218,6 +224,7 @@ SOURCES = \
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\

+               imagfill.cpp,\

                imaggif.cpp,\
                imagiff.cpp,\
                imagjpeg.cpp,\
                imaggif.cpp,\
                imagiff.cpp,\
                imagjpeg.cpp,\


@@ -237,6 +244,7 @@ SOURCES = \
                menucmn.cpp,\
                mimecmn.cpp,\
                module.cpp,\
                menucmn.cpp,\
                mimecmn.cpp,\
                module.cpp,\

+               msgout.cpp,\

                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\


@@ -253,6 +261,7 @@ SOURCES = \
                sckstrm.cpp,\
                sizer.cpp,\
                socket.cpp,\
                sckstrm.cpp,\
                sizer.cpp,\
                socket.cpp,\

+               settcmn.cpp,\

                statbar.cpp,\
                strconv.cpp,\
                stream.cpp,\
                statbar.cpp,\
                strconv.cpp,\
                stream.cpp,\


@@ -287,9 +296,11 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)

        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)

+       library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)

 .else
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__
 .else
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__


@@ -326,6 +337,7 @@ lexer.c : lexer.l
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp

+bmpbase.obj : bmpbase.cpp

 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp


@@ -375,6 +387,7 @@ iconbndl.obj : iconbndl.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp

+imagfill.obj : imagfill.cpp

 imaggif.obj : imaggif.cpp
 imagiff.obj : imagiff.cpp
 imagjpeg.obj : imagjpeg.cpp
 imaggif.obj : imaggif.cpp
 imagiff.obj : imagiff.cpp
 imagjpeg.obj : imagjpeg.cpp


@@ -394,6 +407,7 @@ memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
 menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp

+msgout.obj : msgout.cpp

 mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
 mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp


@@ -410,6 +424,7 @@ sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp

+settcmn.obj : settcmn.cpp

 statbar.obj : statbar.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 statbar.obj : statbar.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp