X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..fba8e95e92adcdfdd3507c26a6e8cefabbbfef57:/src/html/descrip.mms

diff --git a/src/html/descrip.mms b/src/html/descrip.mms
index 503f51c556..4b74e14267 100644
--- a/src/html/descrip.mms
+++ b/src/html/descrip.mms
@@ -14,21 +14,21 @@ 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
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -41,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_pre.obj,m_tables.obj,winpars.obj
+	m_list.obj,m_pre.obj,m_tables.obj,winpars.obj,chm.obj,m_style.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_pre.cpp,m_tables.cpp,winpars.cpp
+	m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp,chm.cpp,m_style.cpp
   
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -55,10 +55,10 @@ 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)
+.else
+.ifdef __WXX11__
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
@@ -82,3 +82,5 @@ m_list.obj : m_list.cpp
 m_pre.obj : m_pre.cpp
 m_tables.obj : m_tables.cpp
 winpars.obj : winpars.cpp
+chm.obj : chm.cpp
+m_style.obj : m_style.cpp
\ No newline at end of file