Unicode compilation fixes, also moved private constants into the .cpp

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index ad08e118991e24319f70a78b0f39d88f42cdd6d2..fd2888ca256d48152ecf3bc164e7bed2d9fae1b3 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,25 +9,40 @@
        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,\
+               calctrl.obj,\
                caret.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                dcpsg.obj,\
+               dirctrlg.obj,\
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
+               gridctrl.obj,\
+               gridsel.obj,\
                helpext.obj,\
                helphtml.obj,\
                helpwxht.obj,\
@@ -37,7 +52,6 @@ OBJECTS = \
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
-               notebook.obj,\
                numdlgg.obj,\
                panelg.obj,\
                printps.obj,\
@@ -47,25 +61,31 @@ OBJECTS = \
                propform.obj,\
                proplist.obj,\
                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 = \
+               accel.cpp,\
                busyinfo.cpp,\
+               calctrl.cpp,\
                caret.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                dcpsg.cpp,\
+               dirctrlg.cpp,\
                dirdlgg.cpp,\
+               filedlgg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
+               gridctrl.cpp,\
+               gridsel.cpp,\
                helpext.cpp,\
                helphtml.cpp,\
                helpwxht.cpp,\
@@ -77,6 +97,7 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
+               paletteg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
@@ -85,31 +106,47 @@ SOURCES = \
                propform.cpp,\
                proplist.cpp,\
                sashwin.cpp,\
-               scrolwin.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
+               tbarsmpl.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
-               treectrl.cpp,\
+               tipwin.cpp,\
+               treectlg.cpp,\
                wizard.cpp
 
+.ifdef __WXMOTIF__
+OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+.else
+OBJECTS0=,accel.obj,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
 
+accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
+calctrl.obj : calctrl.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
+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
 helpwxht.obj : helpwxht.cpp
@@ -121,6 +158,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
@@ -128,13 +166,16 @@ 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
-scrolwin.obj : scrolwin.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
-treectrl.obj : treectrl.cpp
+tipwin.obj : tipwin.cpp
+treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp