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 ad08e118991e24319f70a78b0f39d88f42cdd6d2..f95426fa7db096db69a50a3ab99f85810f16e4d5 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,22 +9,35 @@
        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__
+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
 
 .suffixes : .cpp
 
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .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,\
 
 OBJECTS = \
                busyinfo.obj,\

+               calctrl.obj,\

                caret.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                dcpsg.obj,\
                caret.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                dcpsg.obj,\

+               dirctrlg.obj,\

                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\


@@ -37,7 +50,6 @@ OBJECTS = \
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\

-               notebook.obj,\

                numdlgg.obj,\
                panelg.obj,\
                printps.obj,\
                numdlgg.obj,\
                panelg.obj,\
                printps.obj,\


@@ -49,21 +61,25 @@ OBJECTS = \
                sashwin.obj,\
                scrolwin.obj,\
                splitter.obj,\
                sashwin.obj,\
                scrolwin.obj,\
                splitter.obj,\

-               statline.obj,\

                statusbr.obj,\
                statusbr.obj,\

+               tbarsmpl.obj,\

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

-               treectrl.obj,\
+               tipwin.obj,\
+               treectlg.obj,\

                wizard.obj
 
 SOURCES = \
                busyinfo.cpp,\
                wizard.obj
 
 SOURCES = \
                busyinfo.cpp,\

+               calctrl.cpp,\

                caret.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                dcpsg.cpp,\
                caret.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                dcpsg.cpp,\

+               dirctrlg.cpp,\

                dirdlgg.cpp,\
                dirdlgg.cpp,\

+               filedlgg.cpp,\

                fontdlgg.cpp,\
                grid.cpp,\
                helpext.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
                helpext.cpp,\


@@ -89,25 +105,41 @@ SOURCES = \
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\

+               tbarsmpl.cpp,\

                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\

-               treectrl.cpp,\
+               tipwin.cpp,\
+               treectlg.cpp,\

                wizard.cpp
 
                wizard.cpp
 

+.ifdef __WXMOTIF__
+OBJECTS0=,statline.obj,\
+               notebook.obj
+.else
+OBJECTS0=,filedlgg.obj
+
+.endif

 
 all : $(SOURCES)
 
 all : $(SOURCES)

-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)

 .ifdef __WXMOTIF__
 .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
 .endif
 
 busyinfo.obj : busyinfo.cpp

+calctrl.obj : calctrl.cpp

 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 dcpsg.obj : dcpsg.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 dcpsg.obj : dcpsg.cpp

+dirctrlg.obj : dirctrlg.cpp

 dirdlgg.obj : dirdlgg.cpp
 dirdlgg.obj : dirdlgg.cpp

+filedlgg.obj : filedlgg.cpp

 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
 helpext.obj : helpext.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
 helpext.obj : helpext.cpp


@@ -133,8 +165,10 @@ 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

+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

-treectrl.obj : treectrl.cpp
+tipwin.obj : tipwin.cpp
+treectlg.obj : treectlg.cpp

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