X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61e6020f90dba1d527d5991fb7e5325b1395bd0a..fbf456aa8952c6d2d3edeea1208b0e3159a3cb8d:/src/common/descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 80b609c340..4d56e26f5f 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -15,9 +15,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,6 +51,7 @@ OBJECTS = \
 		clipcmn.obj,\
 		clntdata.obj,\
 		cmdline.obj,\
+		cmdproc.obj,\
 		cmndata.obj,\
 		config.obj,\
 		containr.obj,\
@@ -53,8 +61,10 @@ OBJECTS = \
 		datetime.obj,\
 		datstrm.obj,\
 		db.obj,\
+		dbgrid.obj,\
 		dbtable.obj,\
 		dcbase.obj,\
+		dircmn.obj,\
 		dlgcmn.obj,\
 		dobjcmn.obj,\
 		docmdi.obj,\
@@ -71,21 +81,23 @@ OBJECTS = \
 		filefn.obj,\
 		filesys.obj,\
 		fontcmn.obj,\
-		fontmap.obj
+		fontmap.obj,\
+		framecmn.obj
 
-OBJECTS1=framecmn.obj,\
-		fs_inet.obj,\
+OBJECTS1=fs_inet.obj,\
 		fs_zip.obj,\
 		ftp.obj,\
 		gdicmn.obj,\
 		gifdecod.obj,\
 		hash.obj,\
+		hashmap.obj,\
 		helpbase.obj,\
 		http.obj,\
 		imagall.obj,\
 		imagbmp.obj,\
 		image.obj,\
 		imaggif.obj,\
+		imagiff.obj,\
 		imagjpeg.obj,\
 		imagpcx.obj,\
 		imagpng.obj,\
@@ -106,8 +118,8 @@ OBJECTS1=framecmn.obj,\
 		mstream.obj,\
 		nbkbase.obj,\
 		object.obj,\
-		objstrm.obj,\
 		paper.obj,\
+		popupcmn.obj,\
 		prntbase.obj,\
 		process.obj,\
 		protocol.obj,\
@@ -117,7 +129,6 @@ OBJECTS1=framecmn.obj,\
 		sckfile.obj,\
 		sckipc.obj,\
 		sckstrm.obj,\
-		serbase.obj,\
 		sizer.obj,\
 		socket.obj,\
 		statbar.obj,\
@@ -126,6 +137,7 @@ OBJECTS1=framecmn.obj,\
 		string.obj,\
 		sysopt.obj,\
 		tbarbase.obj,\
+		textbuf.obj,\
 		textcmn.obj,\
 		textfile.obj,\
 		timercmn.obj,\
@@ -134,8 +146,9 @@ OBJECTS1=framecmn.obj,\
 		treebase.obj,\
 		txtstrm.obj,\
 		unzip.obj,\
-		url.obj,\
-		utilscmn.obj,\
+		url.obj
+
+OBJECTS2=utilscmn.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
@@ -143,9 +156,8 @@ OBJECTS1=framecmn.obj,\
 		wfstream.obj,\
 		wincmn.obj,\
 		wxchar.obj,\
-		wxexpr.obj
-
-OBJECTS2=xpmdecod.obj,\
+		wxexpr.obj,\
+		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
@@ -156,6 +168,7 @@ SOURCES = \
 		clipcmn.cpp,\
 		clntdata.cpp,\
 		cmdline.cpp,\
+		cmdproc.cpp,\
 		cmndata.cpp,\
 		config.cpp,\
 		containr.cpp,\
@@ -165,8 +178,10 @@ SOURCES = \
 		datetime.cpp,\
 		datstrm.cpp,\
 		db.cpp,\
+		dbgrid.cpp,\
 		dbtable.cpp,\
 		dcbase.cpp,\
+		dircmn.cpp,\
 		dlgcmn.cpp,\
 		dobjcmn.cpp,\
 		docmdi.cpp,\
@@ -191,12 +206,14 @@ SOURCES = \
 		gdicmn.cpp,\
 		gifdecod.cpp,\
 		hash.cpp,\
+		hashmap.cpp,\
 		helpbase.cpp,\
 		http.cpp,\
 		imagall.cpp,\
 		imagbmp.cpp,\
 		image.cpp,\
 		imaggif.cpp,\
+		imagiff.cpp,\
 		imagjpeg.cpp,\
 		imagpcx.cpp,\
 		imagpng.cpp,\
@@ -217,8 +234,8 @@ SOURCES = \
 		mstream.cpp,\
 		nbkbase.cpp,\
 		object.cpp,\
-		objstrm.cpp,\
 		paper.cpp,\
+		popupcmn.cpp,\
 		prntbase.cpp,\
 		process.cpp,\
 		protocol.cpp,\
@@ -228,7 +245,6 @@ SOURCES = \
 		sckfile.cpp,\
 		sckipc.cpp,\
 		sckstrm.cpp,\
-		serbase.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
 		statbar.cpp,\
@@ -237,6 +253,7 @@ SOURCES = \
 		sysopt.cpp,\
 		string.cpp,\
 		tbarbase.cpp,\
+		textbuf.cpp,\
 		textcmn.cpp,\
 		textfile.cpp,\
 		timercmn.cpp,\
@@ -269,11 +286,17 @@ all : $(SOURCES)
 	library [--.lib]libwx_motif.olb $(OBJECTS2)
 .else
 .ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+	library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
+	library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
+.else
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
 	library [--.lib]libwx_gtk.olb $(OBJECTS1)
 	library [--.lib]libwx_gtk.olb $(OBJECTS2)
 .endif
 .endif
+.endif
 
 parser.obj : parser.c lexer.c
 parser.c : parser.y lexer.c
@@ -299,6 +322,7 @@ choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
 cmdline.obj : cmdline.cpp
+cmdproc.obj : cmdproc.cpp
 cmndata.obj : cmndata.cpp
 config.obj : config.cpp
 containr.obj : containr.cpp
@@ -308,8 +332,10 @@ ctrlsub.obj : ctrlsub.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
+dbgrid.obj : dbgrid.cpp
 dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
+dircmn.obj : dircmn.cpp
 dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp
@@ -334,12 +360,14 @@ ftp.obj : ftp.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
+hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
 imaggif.obj : imaggif.cpp
+imagiff.obj : imagiff.cpp
 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
@@ -360,8 +388,8 @@ module.obj : module.cpp
 mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
-objstrm.obj : objstrm.cpp
 paper.obj : paper.cpp
+popupcmn.obj : popupcmn.cpp
 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
@@ -371,7 +399,6 @@ sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
-serbase.obj : serbase.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 statbar.obj : statbar.cpp
@@ -380,6 +407,7 @@ stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
+textbuf.obj : textbuf.cpp
 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp