Various compile fixes.

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

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index 0e001317ee86e2341ef86c64f6cba0dc33109742..725abeff548007775fd3c0b7580ee87ea537fdf4 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -9,7 +9,9 @@
        define wx [--.include.wx]
 
 .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
 CXX_DEFINE =
 .endif
@@ -19,7 +21,7 @@ CXX_DEFINE =
 .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 = \
                xmcombo.obj,\
@@ -49,6 +51,7 @@ OBJECTS = \
                frame.obj,\
                gauge.obj,\
                gdiobj.obj,\
+               glcanvas.obj,\
                gsockmot.obj,\
                icon.obj,\
                listbox.obj,\
@@ -103,6 +106,7 @@ SOURCES = \
                frame.cpp,\
                gauge.cpp,\
                gdiobj.cpp,\
+               glcanvas.cpp,\
                gsockmot.c,\
                icon.cpp,\
                listbox.cpp,\
@@ -138,7 +142,7 @@ all : $(SOURCES)
 .endif
 
 xmcombo.obj : [.xmcombo]xmcombo.c
-       cc $(CFLAGS)$(CXX_DEFINE) [.xmcombo]xmcombo.c
+       cc $(CFLAGS)$(CC_DEFINE) [.xmcombo]xmcombo.c
 
 accel.obj : accel.cpp
 app.obj : app.cpp
@@ -166,6 +170,7 @@ font.obj : font.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp
+glcanvas.obj : glcanvas.cpp
 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp