digital mars updated

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 7e09011a7bd3be4217ce8853d59f423908fac34a..08eb79db17ffc246106f1c56038a094669aa3149 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,12 +9,24 @@
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
        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__
 .else
 .ifdef __WXGTK__

-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+.ifdef __WXUNIVERSAL__
+CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm
+.else
+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
+.endif

 .else
 CXX_DEFINE =
 .else
 CXX_DEFINE =

+CC_DEFINE =

 .endif
 .endif
 
 .endif
 .endif
 


@@ -22,6 +34,8 @@ CXX_DEFINE =
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp

+.c.obj :
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c

 
 OBJECTS = \
                busyinfo.obj,\
 
 OBJECTS = \
                busyinfo.obj,\


@@ -34,10 +48,10 @@ OBJECTS = \
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\

+               gridctrl.obj,\
+               gridsel.obj,\

                helpext.obj,\
                helphtml.obj,\
                helpext.obj,\
                helphtml.obj,\

-               helpwxht.obj,\
-               helpxlp.obj,\

                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\


@@ -45,25 +59,21 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\

-               plot.obj,\

                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\

-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\

                sashwin.obj,\
                sashwin.obj,\

-               scrolwin.obj,\

                splitter.obj,\
                splitter.obj,\

-               statusbr.obj,\

                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\

+               tipwin.obj,\

                treectlg.obj,\
                wizard.obj
 
 SOURCES = \
                treectlg.obj,\
                wizard.obj
 
 SOURCES = \

+               accel.cpp,\

                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\


@@ -75,10 +85,10 @@ SOURCES = \
                filedlgg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
                filedlgg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\

+               gridctrl.cpp,\
+               gridsel.cpp,\

                helpext.cpp,\
                helphtml.cpp,\
                helpext.cpp,\
                helphtml.cpp,\

-               helpwxht.cpp,\
-               helpxlp.cpp,\

                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\


@@ -86,16 +96,12 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               paletteg.cpp,\

                panelg.cpp,\
                panelg.cpp,\

-               plot.cpp,\

                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\

-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\

                sashwin.cpp,\
                sashwin.cpp,\

-               scrolwin.cpp,\

                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\


@@ -103,15 +109,18 @@ SOURCES = \
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\

+               tipwin.cpp,\

                treectlg.cpp,\
                wizard.cpp
 
 .ifdef __WXMOTIF__
                treectlg.cpp,\
                wizard.cpp
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statline.obj,\
-               notebook.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj

 .else
 .else

-OBJECTS0=,filedlgg.obj
-
+.ifdef __WXUNIVERSAL__
+OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.else
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif

 .endif
 
 all : $(SOURCES)
 .endif
 
 all : $(SOURCES)


@@ -120,10 +129,15 @@ all : $(SOURCES)
        library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__

+.ifdef __WXUNIVERSAL__
+       library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0)
+.else

        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif

+.endif

 
 

+accel.obj : accel.cpp

 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp


@@ -135,10 +149,10 @@ dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp

+gridctrl.obj : gridctrl.cpp
+gridsel.obj : gridsel.cpp

 helpext.obj : helpext.cpp
 helphtml.obj : helphtml.cpp
 helpext.obj : helpext.cpp
 helphtml.obj : helphtml.cpp

-helpwxht.obj : helpwxht.cpp
-helpxlp.obj : helpxlp.cpp

 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp


@@ -146,16 +160,14 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp

+paletteg.obj : paletteg.cpp

 panelg.obj : panelg.cpp
 panelg.obj : panelg.cpp

-plot.obj : plot.cpp

 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp

-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp

 sashwin.obj : sashwin.cpp
 sashwin.obj : sashwin.cpp

-scrolwin.obj : scrolwin.cpp

 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp


@@ -163,5 +175,6 @@ tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp

+tipwin.obj : tipwin.cpp

 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp