removed shift/reduce conflict

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 0bc7210479f84b17885c4228cdccc9aa21c07891..1f9a4bfdc03a8cdf7682a3fd9622da9a434d90b7 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -10,12 +10,17 @@
        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__
 .else
 .ifdef __WXGTK__

-CXX_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

 .else
 CXX_DEFINE =
 .else
 CXX_DEFINE =

+CC_DEFINE =

 .endif
 .endif
 
 .endif
 .endif
 


@@ -30,7 +35,7 @@ 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,\
 
 OBJECTS = \
                parser.obj,\


@@ -40,6 +45,7 @@ OBJECTS = \
                cmdline.obj,\
                cmndata.obj,\
                config.obj,\
                cmdline.obj,\
                cmndata.obj,\
                config.obj,\

+               cshelp.obj,\

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


@@ -59,6 +65,7 @@ OBJECTS = \
                ffile.obj,\
                file.obj,\
                fileconf.obj,\
                ffile.obj,\
                file.obj,\
                fileconf.obj,\

+               filename.obj,\

                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\
                filefn.obj,\
                filesys.obj,\
                fontcmn.obj,\


@@ -140,6 +147,7 @@ SOURCES = \
                cmdline.cpp,\
                cmndata.cpp,\
                config.cpp,\
                cmdline.cpp,\
                cmndata.cpp,\
                config.cpp,\

+               cshelp.cpp,\

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


@@ -159,6 +167,7 @@ SOURCES = \
                ffile.cpp,\
                file.cpp,\
                fileconf.cpp,\
                ffile.cpp,\
                file.cpp,\
                fileconf.cpp,\

+               filename.cpp,\

                filefn.cpp,\
                filesys.cpp,\
                fontcmn.cpp,\
                filefn.cpp,\
                filesys.cpp,\
                fontcmn.cpp,\


@@ -269,6 +278,7 @@ clipcmn.obj : clipcmn.cpp
 cmndata.obj : cmndata.cpp
 cmdline.obj : cmdline.cpp
 config.obj : config.cpp
 cmndata.obj : cmndata.cpp
 cmdline.obj : cmdline.cpp
 config.obj : config.cpp

+cshelp.obj : cshelp.cpp

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


@@ -289,6 +299,7 @@ ffile.obj : ffile.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp

+filename.obj : filename.cpp

 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp