X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dae752d4b1bb5bdf1d47833191262c760331681e..0c44c1c63f96363fe834ce1c7e52f16961f14cc5:/src/generic/descrip.mms

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index fd2888ca25..ccee2b72ea 100644
--- 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 =
@@ -45,8 +52,6 @@ OBJECTS = \
 		gridsel.obj,\
 		helpext.obj,\
 		helphtml.obj,\
-		helpwxht.obj,\
-		helpxlp.obj,\
 		imaglist.obj,\
 		laywin.obj,\
 		listctrl.obj,\
@@ -62,7 +67,6 @@ OBJECTS = \
 		proplist.obj,\
 		sashwin.obj,\
 		splitter.obj,\
-		statusbr.obj,\
 		tbarsmpl.obj,\
 		tabg.obj,\
 		textdlgg.obj,\
@@ -88,8 +92,6 @@ SOURCES = \
 		gridsel.cpp,\
 		helpext.cpp,\
 		helphtml.cpp,\
-		helpwxht.cpp,\
-		helpxlp.cpp,\
 		imaglist.cpp,\
 		laywin.cpp,\
 		listctrl.cpp,\
@@ -118,9 +120,13 @@ SOURCES = \
 		wizard.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
+.ifdef __WXUNIVERSAL__
 OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.else
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif
 .endif
 
 all : $(SOURCES)
@@ -129,9 +135,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
@@ -149,8 +159,6 @@ 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