Committing in .

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index ca8a36bf51534b06d872dc656aed6493e655fb7f..044ad827e8c6fe0c3a6940d483454bdc60e08ed9 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -15,9 +15,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__

+.ifdef __WXUNIVERSAL__
+CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm
+.else

 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm

+.endif

 .else
 CXX_DEFINE =
 CC_DEFINE =
 .else
 CXX_DEFINE =
 CC_DEFINE =


@@ -40,6 +47,8 @@ LEX=flex
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\

+               artprov.obj,\
+               artstd.obj,\

                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\


@@ -57,6 +66,7 @@ OBJECTS = \
                dbgrid.obj,\
                dbtable.obj,\
                dcbase.obj,\
                dbgrid.obj,\
                dbtable.obj,\
                dcbase.obj,\

+               dircmn.obj,\

                dlgcmn.obj,\
                dobjcmn.obj,\
                docmdi.obj,\
                dlgcmn.obj,\
                dobjcmn.obj,\
                docmdi.obj,\


@@ -73,21 +83,25 @@ 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,\
                gifdecod.obj,\
                hash.obj,\
                fs_zip.obj,\
                ftp.obj,\
                gdicmn.obj,\
                gifdecod.obj,\
                hash.obj,\

+               hashmap.obj,\

                helpbase.obj,\
                http.obj,\
                helpbase.obj,\
                http.obj,\

+               iconbndl.obj,\

                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\

+               imagfill.obj,\

                imaggif.obj,\
                imaggif.obj,\

+               imagiff.obj,\

                imagjpeg.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagjpeg.obj,\
                imagpcx.obj,\
                imagpng.obj,\


@@ -108,8 +122,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,\


@@ -119,7 +133,6 @@ OBJECTS1=framecmn.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckstrm.obj,\

-               serbase.obj,\

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


@@ -137,8 +150,9 @@ OBJECTS1=framecmn.obj,\
                treebase.obj,\
                txtstrm.obj,\
                unzip.obj,\
                treebase.obj,\
                txtstrm.obj,\
                unzip.obj,\

-               url.obj,\
-               utilscmn.obj,\
+               url.obj
+
+OBJECTS2=utilscmn.obj,\

                valgen.obj,\
                validate.obj,\
                valtext.obj,\
                valgen.obj,\
                validate.obj,\
                valtext.obj,\


@@ -146,15 +160,16 @@ OBJECTS1=framecmn.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\

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

                zipstrm.obj,\
                zstream.obj
 
 SOURCES = \
                parser.y,\
                appcmn.cpp,\
                zipstrm.obj,\
                zstream.obj
 
 SOURCES = \
                parser.y,\
                appcmn.cpp,\

+               artprov.cpp,\
+               artstd.cpp,\

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


@@ -172,6 +187,7 @@ SOURCES = \
                dbgrid.cpp,\
                dbtable.cpp,\
                dcbase.cpp,\
                dbgrid.cpp,\
                dbtable.cpp,\
                dcbase.cpp,\

+               dircmn.cpp,\

                dlgcmn.cpp,\
                dobjcmn.cpp,\
                docmdi.cpp,\
                dlgcmn.cpp,\
                dobjcmn.cpp,\
                docmdi.cpp,\


@@ -196,12 +212,16 @@ SOURCES = \
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\

+               hashmap.cpp,\

                helpbase.cpp,\
                http.cpp,\
                helpbase.cpp,\
                http.cpp,\

+               iconbndl.cpp,\

                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\

+               imagfill.cpp,\

                imaggif.cpp,\
                imaggif.cpp,\

+               imagiff.cpp,\

                imagjpeg.cpp,\
                imagpcx.cpp,\
                imagpng.cpp,\
                imagjpeg.cpp,\
                imagpcx.cpp,\
                imagpng.cpp,\


@@ -222,8 +242,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,\


@@ -233,7 +253,6 @@ SOURCES = \
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\
                sckfile.cpp,\
                sckipc.cpp,\
                sckstrm.cpp,\

-               serbase.cpp,\

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


@@ -275,11 +294,17 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_motif.olb $(OBJECTS2)
 .else
 .ifdef __WXGTK__

+.ifdef __WXUNIVERSAL__
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
+.else

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

+.endif

 
 parser.obj : parser.c lexer.c
 parser.c : parser.y lexer.c
 
 parser.obj : parser.c lexer.c
 parser.c : parser.y lexer.c


@@ -301,6 +326,8 @@ lexer.c : lexer.l
        delete lexyy.c;*
 
 appcmn.obj : appcmn.cpp
        delete lexyy.c;*
 
 appcmn.obj : appcmn.cpp

+artprov.obj : artprov.cpp
+artstd.obj : artstd.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


@@ -318,6 +345,7 @@ db.obj : db.cpp
 dbgrid.obj : dbgrid.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
 dbgrid.obj : dbgrid.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp

+dircmn.obj : dircmn.cpp

 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp
 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp


@@ -342,12 +370,16 @@ ftp.obj : ftp.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp

+hashmap.obj : hashmap.cpp

 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp

+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
 imaggif.obj : imaggif.cpp

+imagiff.obj : imagiff.cpp

 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp


@@ -368,8 +400,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


@@ -379,7 +411,6 @@ 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
 statbar.obj : statbar.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 statbar.obj : statbar.cpp