X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33381c829bba890f5d0e0642dbe2fdfa60fafd4d..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/common/descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index de1e7ff2c6..044ad827e8 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,9 +47,13 @@ LEX=flex
 OBJECTS = \
 		parser.obj,\
 		appcmn.obj,\
+		artprov.obj,\
+		artstd.obj,\
 		choiccmn.obj,\
 		clipcmn.obj,\
+		clntdata.obj,\
 		cmdline.obj,\
+		cmdproc.obj,\
 		cmndata.obj,\
 		config.obj,\
 		containr.obj,\
@@ -52,8 +63,10 @@ OBJECTS = \
 		datetime.obj,\
 		datstrm.obj,\
 		db.obj,\
+		dbgrid.obj,\
 		dbtable.obj,\
 		dcbase.obj,\
+		dircmn.obj,\
 		dlgcmn.obj,\
 		dobjcmn.obj,\
 		docmdi.obj,\
@@ -70,21 +83,25 @@ 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,\
+		iconbndl.obj,\
 		imagall.obj,\
 		imagbmp.obj,\
 		image.obj,\
+		imagfill.obj,\
 		imaggif.obj,\
+		imagiff.obj,\
 		imagjpeg.obj,\
 		imagpcx.obj,\
 		imagpng.obj,\
@@ -105,8 +122,8 @@ OBJECTS1=framecmn.obj,\
 		mstream.obj,\
 		nbkbase.obj,\
 		object.obj,\
-		objstrm.obj,\
 		paper.obj,\
+		popupcmn.obj,\
 		prntbase.obj,\
 		process.obj,\
 		protocol.obj,\
@@ -116,23 +133,26 @@ OBJECTS1=framecmn.obj,\
 		sckfile.obj,\
 		sckipc.obj,\
 		sckstrm.obj,\
-		serbase.obj,\
 		sizer.obj,\
 		socket.obj,\
+		statbar.obj,\
 		strconv.obj,\
 		stream.obj,\
 		string.obj,\
 		sysopt.obj,\
 		tbarbase.obj,\
+		textbuf.obj,\
 		textcmn.obj,\
 		textfile.obj,\
 		timercmn.obj,\
 		tokenzr.obj,\
+		toplvcmn.obj,\
 		treebase.obj,\
 		txtstrm.obj,\
 		unzip.obj,\
-		url.obj,\
-		utilscmn.obj,\
+		url.obj
+
+OBJECTS2=utilscmn.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
@@ -148,9 +168,13 @@ OBJECTS1=framecmn.obj,\
 SOURCES = \
 		parser.y,\
 		appcmn.cpp,\
+		artprov.cpp,\
+		artstd.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
+		clntdata.cpp,\
 		cmdline.cpp,\
+		cmdproc.cpp,\
 		cmndata.cpp,\
 		config.cpp,\
 		containr.cpp,\
@@ -160,8 +184,10 @@ SOURCES = \
 		datetime.cpp,\
 		datstrm.cpp,\
 		db.cpp,\
+		dbgrid.cpp,\
 		dbtable.cpp,\
 		dcbase.cpp,\
+		dircmn.cpp,\
 		dlgcmn.cpp,\
 		dobjcmn.cpp,\
 		docmdi.cpp,\
@@ -186,12 +212,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,\
@@ -212,8 +242,8 @@ SOURCES = \
 		mstream.cpp,\
 		nbkbase.cpp,\
 		object.cpp,\
-		objstrm.cpp,\
 		paper.cpp,\
+		popupcmn.cpp,\
 		prntbase.cpp,\
 		process.cpp,\
 		protocol.cpp,\
@@ -223,18 +253,20 @@ SOURCES = \
 		sckfile.cpp,\
 		sckipc.cpp,\
 		sckstrm.cpp,\
-		serbase.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
+		statbar.cpp,\
 		strconv.cpp,\
 		stream.cpp,\
 		sysopt.cpp,\
 		string.cpp,\
 		tbarbase.cpp,\
+		textbuf.cpp,\
 		textcmn.cpp,\
 		textfile.cpp,\
 		timercmn.cpp,\
 		tokenzr.cpp,\
+		toplvcmn.cpp,\
 		treebase.cpp,\
 		txtstrm.cpp,\
 		unzip.c,\
@@ -255,13 +287,22 @@ SOURCES = \
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 	library [--.lib]libwx_motif.olb $(OBJECTS1)
+	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
 
@@ -285,10 +326,14 @@ 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
-cmndata.obj : cmndata.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
 cshelp.obj : cshelp.cpp
@@ -297,8 +342,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
@@ -323,12 +370,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
@@ -349,8 +400,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
@@ -360,18 +411,20 @@ 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
 strconv.obj : strconv.cpp
 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
 tokenzr.obj : tokenzr.cpp
+toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
 unzip.obj : unzip.c