X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef338f9a93dcb49ef94f559c1d146a9d40c9c15e..505f70dec68ba08ade903e8e9e0eb41ebd36531c:/src/common/descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 5222a3b78d..ff2d324571 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 =
@@ -40,6 +47,8 @@ LEX=flex
 OBJECTS = \
 		parser.obj,\
 		appcmn.obj,\
+		artprov.obj,\
+		artstd.obj,\
 		choiccmn.obj,\
 		clipcmn.obj,\
 		clntdata.obj,\
@@ -83,12 +92,16 @@ OBJECTS1=fs_inet.obj,\
 		gdicmn.obj,\
 		gifdecod.obj,\
 		hash.obj,\
+		hashmap.obj,\
 		helpbase.obj,\
 		http.obj,\
+		iconbndl.obj,\
 		imagall.obj,\
 		imagbmp.obj,\
 		image.obj,\
+		imagfill.obj,\
 		imaggif.obj,\
+		imagiff.obj,\
 		imagjpeg.obj,\
 		imagpcx.obj,\
 		imagpng.obj,\
@@ -106,6 +119,7 @@ OBJECTS1=fs_inet.obj,\
 		menucmn.obj,\
 		mimecmn.obj,\
 		module.obj,\
+		msgout.obj,\
 		mstream.obj,\
 		nbkbase.obj,\
 		object.obj,\
@@ -122,6 +136,7 @@ OBJECTS1=fs_inet.obj,\
 		sckstrm.obj,\
 		sizer.obj,\
 		socket.obj,\
+		settcmn.obj,\
 		statbar.obj,\
 		strconv.obj,\
 		stream.obj,\
@@ -137,8 +152,9 @@ OBJECTS1=fs_inet.obj,\
 		treebase.obj,\
 		txtstrm.obj,\
 		unzip.obj,\
-		url.obj,\
-		utilscmn.obj,\
+		url.obj
+
+OBJECTS2=utilscmn.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
@@ -146,15 +162,16 @@ OBJECTS1=fs_inet.obj,\
 		wfstream.obj,\
 		wincmn.obj,\
 		wxchar.obj,\
-		wxexpr.obj
-
-OBJECTS2=xpmdecod.obj,\
+		wxexpr.obj,\
+		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
 SOURCES = \
 		parser.y,\
 		appcmn.cpp,\
+		artprov.cpp,\
+		artstd.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
 		clntdata.cpp,\
@@ -197,12 +214,16 @@ SOURCES = \
 		gdicmn.cpp,\
 		gifdecod.cpp,\
 		hash.cpp,\
+		hashmap.cpp,\
 		helpbase.cpp,\
 		http.cpp,\
+		iconbndl.cpp,\
 		imagall.cpp,\
 		imagbmp.cpp,\
 		image.cpp,\
+		imagfill.cpp,\
 		imaggif.cpp,\
+		imagiff.cpp,\
 		imagjpeg.cpp,\
 		imagpcx.cpp,\
 		imagpng.cpp,\
@@ -220,6 +241,7 @@ SOURCES = \
 		menucmn.cpp,\
 		mimecmn.cpp,\
 		module.cpp,\
+		msgout.cpp,\
 		mstream.cpp,\
 		nbkbase.cpp,\
 		object.cpp,\
@@ -236,6 +258,7 @@ SOURCES = \
 		sckstrm.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
+		settcmn.cpp,\
 		statbar.cpp,\
 		strconv.cpp,\
 		stream.cpp,\
@@ -275,11 +298,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
@@ -301,6 +330,8 @@ lexer.c : lexer.l
 	delete lexyy.c;*
 
 appcmn.obj : appcmn.cpp
+artprov.obj : artprov.cpp
+artstd.obj : artstd.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
@@ -343,12 +374,16 @@ 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
+iconbndl.obj : iconbndl.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
+imagfill.obj : imagfill.cpp
 imaggif.obj : imaggif.cpp
+imagiff.obj : imagiff.cpp
 imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
@@ -366,6 +401,7 @@ memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
+msgout.obj : msgout.cpp
 mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
@@ -382,6 +418,7 @@ sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
+settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp