a fix for the last fix

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 2aeaa0fe8c63a3afeed834ed47a1298b122897da..f95426fa7db096db69a50a3ab99f85810f16e4d5 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,12 +9,17 @@
        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
 .ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)
+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 =
+CC_DEFINE =
 .endif
 .endif
 
@@ -22,6 +27,8 @@ CXX_DEFINE =
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+.c.obj :
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
                busyinfo.obj,\
@@ -30,6 +37,7 @@ OBJECTS = \
                choicdgg.obj,\
                colrdlgg.obj,\
                dcpsg.obj,\
+               dirctrlg.obj,\
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
@@ -44,7 +52,6 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\
-               plot.obj,\
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
@@ -59,7 +66,8 @@ OBJECTS = \
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
-               treectrl.obj,\
+               tipwin.obj,\
+               treectlg.obj,\
                wizard.obj
 
 SOURCES = \
@@ -69,6 +77,7 @@ SOURCES = \
                choicdgg.cpp,\
                colrdlgg.cpp,\
                dcpsg.cpp,\
+               dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\
                fontdlgg.cpp,\
@@ -85,7 +94,6 @@ SOURCES = \
                notebook.cpp,\
                numdlgg.cpp,\
                panelg.cpp,\
-               plot.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
@@ -101,7 +109,8 @@ SOURCES = \
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
-               treectrl.cpp,\
+               tipwin.cpp,\
+               treectlg.cpp,\
                wizard.cpp
 
 .ifdef __WXMOTIF__
@@ -128,6 +137,7 @@ caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 dcpsg.obj : dcpsg.cpp
+dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
@@ -144,7 +154,6 @@ msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 panelg.obj : panelg.cpp
-plot.obj : plot.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
@@ -160,5 +169,6 @@ tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
-treectrl.obj : treectrl.cpp
+tipwin.obj : tipwin.cpp
+treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp