unicode for mac fixes

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 669c314783870dce1858874f0a588cd53fdae198..afc647b7b52e8520d94a80384715fc6371127604 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -14,9 +14,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
+.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 =
 CC_DEFINE =
@@ -31,7 +38,6 @@ CC_DEFINE =
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-               accel.obj,\
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
@@ -45,9 +51,6 @@ OBJECTS = \
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
-               helphtml.obj,\
-               helpwxht.obj,\
-               helpxlp.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
@@ -58,12 +61,10 @@ OBJECTS = \
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\
+               renderg.obj,\
                sashwin.obj,\
+               selstore.obj,\
                splitter.obj,\
-               statusbr.obj,\
                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
@@ -88,9 +89,6 @@ SOURCES = \
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
-               helphtml.cpp,\
-               helpwxht.cpp,\
-               helpxlp.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
@@ -103,10 +101,9 @@ SOURCES = \
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\
+               renderg.cpp,\
                sashwin.cpp,\
+               selstore.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
@@ -119,10 +116,13 @@ SOURCES = \
                wizard.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statline.obj,\
-               notebook.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+.else
+.ifdef __WXUNIVERSAL__
+OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
 .else
-OBJECTS0=,filedlgg.obj,paletteg.obj
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif
 .endif
 
 all : $(SOURCES)
@@ -131,9 +131,13 @@ all : $(SOURCES)
        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
+.endif
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
@@ -150,9 +154,6 @@ grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.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
@@ -165,10 +166,11 @@ panelg.obj : panelg.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
+renderg.obj : renderg.cpp
 sashwin.obj : sashwin.cpp
+selstore.obj : selstore.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp