X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df744f4d6d1f9d093822980915b7802f95cb98fa..d223107206e4dfa6768e0bc2455325dd49e4d2bb:/src/generic/descrip.mms?ds=sidebyside

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 00474ef579..03002afa2c 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 =
@@ -44,8 +51,6 @@ OBJECTS = \
 		gridctrl.obj,\
 		gridsel.obj,\
 		helpext.obj,\
-		helphtml.obj,\
-		helpwxht.obj,\
 		imaglist.obj,\
 		laywin.obj,\
 		listctrl.obj,\
@@ -56,13 +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,\
 		tipdlg.obj,\
@@ -86,8 +88,6 @@ SOURCES = \
 		gridctrl.cpp,\
 		gridsel.cpp,\
 		helpext.cpp,\
-		helphtml.cpp,\
-		helpwxht.cpp,\
 		imaglist.cpp,\
 		laywin.cpp,\
 		listctrl.cpp,\
@@ -100,14 +100,12 @@ 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,\
-		tbarsmpl.cpp,\
 		tabg.cpp,\
 		textdlgg.cpp,\
 		tipdlg.cpp,\
@@ -116,9 +114,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)
@@ -127,9 +129,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
@@ -146,8 +152,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
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
@@ -160,16 +164,14 @@ 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
-tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp