Fixed problems with the wxDb::Open(wxDb *copyDb) not copying in all the different...

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 9961a0a82b64b2b75867ef923515d33bbbcefeba..688a3d1c90e410e148974be8434d11151f17cfd2 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -10,9 +10,18 @@
        set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__
        set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__

-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
+.else
+.ifdef __WXGTK__
+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

 .else
 CXX_DEFINE =
 .else
 CXX_DEFINE =

+CC_DEFINE =
+.endif

 .endif
 
 YACC=bison/yacc
 .endif
 
 YACC=bison/yacc


@@ -26,18 +35,20 @@ LEX=flex
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :

-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c

 
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
 
 OBJECTS = \
                parser.obj,\
                appcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\

+               cmdline.obj,\

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

+               cshelp.obj,\

                ctrlcmn.obj,\
                ctrlsub.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\

-               date.obj,\
+               datetime.obj,\

                datstrm.obj,\
                db.obj,\
                dbtable.obj,\
                datstrm.obj,\
                db.obj,\
                dbtable.obj,\


@@ -48,6 +59,7 @@ OBJECTS = \
                docview.obj,\
                dynarray.obj,\
                dynlib.obj,\
                docview.obj,\
                dynarray.obj,\
                dynlib.obj,\

+               encconv.obj,\

                event.obj,\
                extended.obj,\
                ffile.obj,\
                event.obj,\
                extended.obj,\
                ffile.obj,\


@@ -75,15 +87,17 @@ OBJECTS1=framecmn.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\

+               imagtiff.obj,\

                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
                lboxcmn.obj,\
                list.obj,\
                log.obj,\
                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
                lboxcmn.obj,\
                list.obj,\
                log.obj,\

+               longlong.obj,\

                memory.obj,\
                menucmn.obj,\
                memory.obj,\
                menucmn.obj,\

-               mimetype.obj,\
+               mimecmn.obj,\

                module.obj,\
                mstream.obj,\
                object.obj,\
                module.obj,\
                mstream.obj,\
                object.obj,\


@@ -104,12 +118,11 @@ OBJECTS1=framecmn.obj,\
                stream.obj,\
                string.obj,\
                tbarbase.obj,\
                stream.obj,\
                string.obj,\
                tbarbase.obj,\

-               tbarsmpl.obj,\

                textcmn.obj,\
                textfile.obj,\
                textcmn.obj,\
                textfile.obj,\

-               time.obj,\

                timercmn.obj,\
                tokenzr.obj,\
                timercmn.obj,\
                tokenzr.obj,\

+               treebase.obj,\

                txtstrm.obj,\
                unzip.obj,\
                url.obj,\
                txtstrm.obj,\
                unzip.obj,\
                url.obj,\


@@ -130,11 +143,13 @@ SOURCES = \
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                appcmn.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\

+               cmdline.cpp,\

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

+               cshelp.cpp,\

                ctrlcmn.cpp,\
                ctrlsub.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\

-               date.cpp,\
+               datetime.cpp,\

                datstrm.cpp,\
                db.cpp,\
                dbtable.cpp,\
                datstrm.cpp,\
                db.cpp,\
                dbtable.cpp,\


@@ -145,6 +160,7 @@ SOURCES = \
                docview.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\
                docview.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\

+               encconv.cpp,\

                event.cpp,\
                extended.c,\
                ffile.cpp,\
                event.cpp,\
                extended.c,\
                ffile.cpp,\


@@ -171,15 +187,17 @@ SOURCES = \
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\

+               imagtiff.cpp,\

                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
                lboxcmn.cpp,\
                list.cpp,\
                log.cpp,\
                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
                lboxcmn.cpp,\
                list.cpp,\
                log.cpp,\

+               longlong.cpp,\

                memory.cpp,\
                menucmn.cpp,\
                memory.cpp,\
                menucmn.cpp,\

-               mimetype.cpp,\
+               mimecmn.cpp,\

                module.cpp,\
                mstream.cpp,\
                object.cpp,\
                module.cpp,\
                mstream.cpp,\
                object.cpp,\


@@ -200,12 +218,11 @@ SOURCES = \
                stream.cpp,\
                string.cpp,\
                tbarbase.cpp,\
                stream.cpp,\
                string.cpp,\
                tbarbase.cpp,\

-               tbarsmpl.cpp,\

                textcmn.cpp,\
                textfile.cpp,\
                textcmn.cpp,\
                textfile.cpp,\

-               time.cpp,\

                timercmn.cpp,\
                tokenzr.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\

+               treebase.cpp,\

                txtstrm.cpp,\
                unzip.c,\
                url.cpp,\
                txtstrm.cpp,\
                unzip.c,\
                url.cpp,\


@@ -227,6 +244,11 @@ all : $(SOURCES)
 .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)

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

 .endif
 
 parser.obj : parser.c lexer.c
 .endif
 
 parser.obj : parser.c lexer.c


@@ -252,10 +274,12 @@ appcmn.obj : appcmn.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 cmndata.obj : cmndata.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 cmndata.obj : cmndata.cpp

+cmdline.obj : cmdline.cpp

 config.obj : config.cpp
 config.obj : config.cpp

+cshelp.obj : cshelp.cpp

 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp

-date.obj : date.cpp
+datetime.obj : datetime.cpp

 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
 dbtable.obj : dbtable.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
 dbtable.obj : dbtable.cpp


@@ -266,6 +290,7 @@ docmdi.obj : docmdi.cpp
 docview.obj : docview.cpp
 dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp
 docview.obj : docview.cpp
 dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp

+encconv.obj : encconv.cpp

 event.obj : event.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp
 event.obj : event.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp


@@ -292,15 +317,17 @@ imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp

+imagtiff.obj : imagtiff.cpp

 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
 lboxcmn.obj : lboxcmn.cpp
 list.obj : list.cpp
 log.obj : log.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
 lboxcmn.obj : lboxcmn.cpp
 list.obj : list.cpp
 log.obj : log.cpp

+longlong.obj : longlong.cpp

 memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
 memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp

-mimetype.obj : mimetype.cpp
+mimecmn.obj : mimecmn.cpp

 module.obj : module.cpp
 mstream.obj : mstream.cpp
 object.obj : object.cpp
 module.obj : module.cpp
 mstream.obj : mstream.cpp
 object.obj : object.cpp


@@ -321,12 +348,11 @@ strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
 stream.obj : stream.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp

-tbarsmpl.obj : tbarsmpl.cpp

 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp

-time.obj : time.cpp

 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp

+treebase.obj : treebase.cpp

 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 url.obj : url.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c
 url.obj : url.cpp