removing dependancy on mac headers from public wx headers (eventually adding wx/mac...

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index de1e7ff2c6e9e4c005afb1feba7c164b47c62c8c..b75f832eacad7a895060173450e002cdf3034149 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -42,7 +42,9 @@ OBJECTS = \
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\

+               clntdata.obj,\

                cmdline.obj,\
                cmdline.obj,\

+               cmdproc.obj,\

                cmndata.obj,\
                config.obj,\
                containr.obj,\
                cmndata.obj,\
                config.obj,\
                containr.obj,\


@@ -52,6 +54,7 @@ OBJECTS = \
                datetime.obj,\
                datstrm.obj,\
                db.obj,\
                datetime.obj,\
                datstrm.obj,\
                db.obj,\

+               dbgrid.obj,\

                dbtable.obj,\
                dcbase.obj,\
                dlgcmn.obj,\
                dbtable.obj,\
                dcbase.obj,\
                dlgcmn.obj,\


@@ -70,10 +73,10 @@ OBJECTS = \
                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\
                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\

-               fontmap.obj
+               fontmap.obj,\
+               framecmn.obj

 
 

-OBJECTS1=framecmn.obj,\
-               fs_inet.obj,\
+OBJECTS1=fs_inet.obj,\

                fs_zip.obj,\
                ftp.obj,\
                gdicmn.obj,\
                fs_zip.obj,\
                ftp.obj,\
                gdicmn.obj,\


@@ -105,8 +108,8 @@ OBJECTS1=framecmn.obj,\
                mstream.obj,\
                nbkbase.obj,\
                object.obj,\
                mstream.obj,\
                nbkbase.obj,\
                object.obj,\

-               objstrm.obj,\

                paper.obj,\
                paper.obj,\

+               popupcmn.obj,\

                prntbase.obj,\
                process.obj,\
                protocol.obj,\
                prntbase.obj,\
                process.obj,\
                protocol.obj,\


@@ -116,18 +119,20 @@ OBJECTS1=framecmn.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\

-               serbase.obj,\

                sizer.obj,\
                socket.obj,\
                sizer.obj,\
                socket.obj,\

+               statbar.obj,\

                strconv.obj,\
                stream.obj,\
                string.obj,\
                sysopt.obj,\
                tbarbase.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
                sysopt.obj,\
                tbarbase.obj,\

+               textbuf.obj,\

                textcmn.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\
                textcmn.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\

+               toplvcmn.obj,\

                treebase.obj,\
                txtstrm.obj,\
                unzip.obj,\
                treebase.obj,\
                txtstrm.obj,\
                unzip.obj,\


@@ -140,8 +145,9 @@ OBJECTS1=framecmn.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\

-               wxexpr.obj,\
-               xpmdecod.obj,\
+               wxexpr.obj
+
+OBJECTS2=xpmdecod.obj,\

                zipstrm.obj,\
                zstream.obj
 
                zipstrm.obj,\
                zstream.obj
 


@@ -150,7 +156,9 @@ SOURCES = \
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\

+               clntdata.cpp,\

                cmdline.cpp,\
                cmdline.cpp,\

+               cmdproc.cpp,\

                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\
                cmndata.cpp,\
                config.cpp,\
                containr.cpp,\


@@ -160,6 +168,7 @@ SOURCES = \
                datetime.cpp,\
                datstrm.cpp,\
                db.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                db.cpp,\

+               dbgrid.cpp,\

                dbtable.cpp,\
                dcbase.cpp,\
                dlgcmn.cpp,\
                dbtable.cpp,\
                dcbase.cpp,\
                dlgcmn.cpp,\


@@ -212,8 +221,8 @@ SOURCES = \
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\

-               objstrm.cpp,\

                paper.cpp,\
                paper.cpp,\

+               popupcmn.cpp,\

                prntbase.cpp,\
                process.cpp,\
                protocol.cpp,\
                prntbase.cpp,\
                process.cpp,\
                protocol.cpp,\


@@ -223,18 +232,20 @@ SOURCES = \
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\

-               serbase.cpp,\

                sizer.cpp,\
                socket.cpp,\
                sizer.cpp,\
                socket.cpp,\

+               statbar.cpp,\

                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
                string.cpp,\
                tbarbase.cpp,\
                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
                string.cpp,\
                tbarbase.cpp,\

+               textbuf.cpp,\

                textcmn.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\
                textcmn.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\

+               toplvcmn.cpp,\

                treebase.cpp,\
                txtstrm.cpp,\
                unzip.c,\
                treebase.cpp,\
                txtstrm.cpp,\
                unzip.c,\


@@ -255,13 +266,16 @@ SOURCES = \
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)

+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)

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

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

 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)

+       library [--.lib]libwx_gtk.olb $(OBJECTS2)

 .endif
 .endif
 
 .endif
 .endif
 


@@ -287,8 +301,10 @@ lexer.c : lexer.l
 appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp

-cmndata.obj : cmndata.cpp
+clntdata.obj : clntdata.cpp

 cmdline.obj : cmdline.cpp
 cmdline.obj : cmdline.cpp

+cmdproc.obj : cmdproc.cpp
+cmndata.obj : cmndata.cpp

 config.obj : config.cpp
 containr.obj : containr.cpp
 cshelp.obj : cshelp.cpp
 config.obj : config.cpp
 containr.obj : containr.cpp
 cshelp.obj : cshelp.cpp


@@ -297,6 +313,7 @@ ctrlsub.obj : ctrlsub.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp

+dbgrid.obj : dbgrid.cpp

 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
 dlgcmn.obj : dlgcmn.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
 dlgcmn.obj : dlgcmn.cpp


@@ -349,8 +366,8 @@ module.obj : module.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

-objstrm.obj : objstrm.cpp

 paper.obj : paper.cpp
 paper.obj : paper.cpp

+popupcmn.obj : popupcmn.cpp

 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp


@@ -360,18 +377,20 @@ sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp

-serbase.obj : serbase.cpp

 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp

+statbar.obj : statbar.cpp

 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp

+textbuf.obj : textbuf.cpp

 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp
 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp

+toplvcmn.obj : toplvcmn.cpp

 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c