compilation fixes

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 2d0347937e59a2d4d230c0b1dcb64140d3b9f1f9..9d93baa3c3183787a2bad20f0f661ef796e7cd72 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,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,\


@@ -36,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,\


@@ -55,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,\


@@ -78,6 +89,7 @@ OBJECTS1=framecmn.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\

+               imagxpm.obj,\

                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
                intl.obj,\
                ipcbase.obj,\
                layout.obj,\


@@ -87,7 +99,7 @@ OBJECTS1=framecmn.obj,\
                longlong.obj,\
                memory.obj,\
                menucmn.obj,\
                longlong.obj,\
                memory.obj,\
                menucmn.obj,\

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

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


@@ -112,6 +124,7 @@ OBJECTS1=framecmn.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\
                textfile.obj,\
                timercmn.obj,\
                tokenzr.obj,\

+               treebase.obj,\

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


@@ -124,6 +137,7 @@ OBJECTS1=framecmn.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\

+               xpmdecod.obj,\

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


@@ -135,6 +149,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,\


@@ -154,6 +169,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,\


@@ -176,6 +192,7 @@ SOURCES = \
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\

+               imagxpm.cpp,\

                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\


@@ -185,7 +202,7 @@ SOURCES = \
                longlong.cpp,\
                memory.cpp,\
                menucmn.cpp,\
                longlong.cpp,\
                memory.cpp,\
                menucmn.cpp,\

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

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


@@ -210,6 +227,7 @@ SOURCES = \
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
                tokenzr.cpp,\

+               treebase.cpp,\

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


@@ -222,6 +240,7 @@ SOURCES = \
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\

+               xpmdecod.cpp,\

                zipstrm.cpp,\
                zstream.cpp
 
                zipstrm.cpp,\
                zstream.cpp
 


@@ -231,6 +250,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


@@ -258,6 +282,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


@@ -278,6 +303,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


@@ -299,6 +325,7 @@ imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp

+imagxpm.obj : imagxpm.cpp

 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp


@@ -308,7 +335,7 @@ log.obj : log.cpp
 longlong.obj : longlong.cpp
 memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
 longlong.obj : longlong.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


@@ -333,6 +360,7 @@ textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
 tokenzr.obj : tokenzr.cpp
 textfile.obj : textfile.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


@@ -345,5 +373,6 @@ wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp

+xpmdecod.obj : xpmdecod.cpp

 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp