-fix for a bug in parsing tag's properties with common suffixes

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 778cb95a45a80ea487b540a576b1f713e1b30bbb..f1aab5578052178e923f421590bd8de8ee90672c 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,15 +9,26 @@
        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)/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
 
 .suffixes : .cpp
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+.c.obj :
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
                busyinfo.obj,\
@@ -26,6 +37,7 @@ OBJECTS = \
                choicdgg.obj,\
                colrdlgg.obj,\
                dcpsg.obj,\
+               dirctrlg.obj,\
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
@@ -38,7 +50,6 @@ OBJECTS = \
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
-               notebook.obj,\
                numdlgg.obj,\
                panelg.obj,\
                printps.obj,\
@@ -50,13 +61,13 @@ OBJECTS = \
                sashwin.obj,\
                scrolwin.obj,\
                splitter.obj,\
-               statline.obj,\
                statusbr.obj,\
                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
-               treectrl.obj,\
+               tipwin.obj,\
+               treectlg.obj,\
                wizard.obj
 
 SOURCES = \
@@ -66,7 +77,9 @@ SOURCES = \
                choicdgg.cpp,\
                colrdlgg.cpp,\
                dcpsg.cpp,\
+               dirctrlg.cpp,\
                dirdlgg.cpp,\
+               filedlgg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
                helpext.cpp,\
@@ -80,6 +93,7 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
+               paletteg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
@@ -96,14 +110,25 @@ SOURCES = \
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
-               treectrl.cpp,\
+               tipwin.cpp,\
+               treectlg.cpp,\
                wizard.cpp
 
+.ifdef __WXMOTIF__
+OBJECTS0=,statline.obj,\
+               notebook.obj
+.else
+OBJECTS0=,filedlgg.obj,paletteg.obj
+.endif
 
 all : $(SOURCES)
-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
 .ifdef __WXMOTIF__
-       library/crea [--.lib]libwx_motif.olb $(OBJECTS)
+       library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXGTK__
+       library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+.endif
 .endif
 
 busyinfo.obj : busyinfo.cpp
@@ -112,7 +137,9 @@ 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
 grid.obj : grid.cpp
 helpext.obj : helpext.cpp
@@ -126,6 +153,7 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
+paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
@@ -142,5 +170,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