Shell version of dllar, needed for building DLLs while generating

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

diff --git a/src/html/descrip.mms b/src/html/descrip.mms
index 081d0bca6b93e30a9ff7ac6bfd8f8277f09702bb..503f51c556e28b6976f9c28aaabfd8ffb7ac01cf 100644 (file)
--- a/src/html/descrip.mms
+++ b/src/html/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 =
@@ -34,13 +41,13 @@ OBJECTS = \
        helpctrl.obj,helpdata.obj,helpfrm.obj,htmlcell.obj,htmlfilt.obj,\
        htmlpars.obj,htmltag.obj,htmlwin.obj,htmprint.obj,m_dflist.obj,\
        m_fonts.obj,m_hline.obj,m_image.obj,m_layout.obj,m_links.obj,\
-       m_list.obj,m_meta.obj,m_pre.obj,m_tables.obj,winpars.obj
+       m_list.obj,m_pre.obj,m_tables.obj,winpars.obj
 
 SOURCES = \
        helpctrl.cpp,helpdata.cpp,helpfrm.cpp,htmlcell.cpp,htmlfilt.cpp,\
        htmlpars.cpp,htmltag.cpp,htmlwin.cpp,htmprint.cpp,m_dflist.cpp,\
        m_fonts.cpp,m_hline.cpp,m_image.cpp,m_layout.cpp,m_links.cpp,\
-       m_list.cpp,m_meta.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp
+       m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp
   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -48,9 +55,13 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+.else
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .endif
 .endif
+.endif
 
 helpctrl.obj : helpctrl.cpp
 helpdata.obj : helpdata.cpp
@@ -68,7 +79,6 @@ m_image.obj : m_image.cpp
 m_layout.obj : m_layout.cpp
 m_links.obj : m_links.cpp
 m_list.obj : m_list.cpp
-m_meta.obj : m_meta.cpp
 m_pre.obj : m_pre.cpp
 m_tables.obj : m_tables.cpp
 winpars.obj : winpars.cpp