X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f8abf9d33fd500234627fe21863ad9ce26afef..baaae89f09ece7ab8a17570ee535683b9d14aeda:/src/common/descrip.mms?ds=sidebyside

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 2d0347937e..a4a2fdc2c2 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -10,9 +10,25 @@
 	set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+	   /assume=(nostdnew,noglobal_array_new)
+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 =
+.endif
 .endif
 
 YACC=bison/yacc
@@ -26,23 +42,31 @@ LEX=flex
 .cpp.obj :
 	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
-	cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 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,\
+		cshelp.obj,\
 		ctrlcmn.obj,\
 		ctrlsub.obj,\
 		datetime.obj,\
 		datstrm.obj,\
 		db.obj,\
+		dbgrid.obj,\
 		dbtable.obj,\
 		dcbase.obj,\
+		dircmn.obj,\
 		dlgcmn.obj,\
 		dobjcmn.obj,\
 		docmdi.obj,\
@@ -55,29 +79,35 @@ OBJECTS = \
 		ffile.obj,\
 		file.obj,\
 		fileconf.obj,\
+		filename.obj,\
 		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,\
 		imagpnm.obj,\
 		imagtiff.obj,\
+		imagxpm.obj,\
 		intl.obj,\
 		ipcbase.obj,\
 		layout.obj,\
@@ -87,35 +117,43 @@ OBJECTS1=framecmn.obj,\
 		longlong.obj,\
 		memory.obj,\
 		menucmn.obj,\
-		mimetype.obj,\
+		mimecmn.obj,\
 		module.obj,\
 		mstream.obj,\
+		nbkbase.obj,\
 		object.obj,\
-		objstrm.obj,\
 		paper.obj,\
+		popupcmn.obj,\
 		prntbase.obj,\
 		process.obj,\
 		protocol.obj,\
+		quantize.obj,\
 		resource.obj,\
 		sckaddr.obj,\
 		sckfile.obj,\
 		sckipc.obj,\
 		sckstrm.obj,\
-		serbase.obj,\
 		sizer.obj,\
 		socket.obj,\
+		settcmn.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,\
@@ -124,24 +162,33 @@ OBJECTS1=framecmn.obj,\
 		wincmn.obj,\
 		wxchar.obj,\
 		wxexpr.obj,\
+		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.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,\
+		cshelp.cpp,\
 		ctrlcmn.cpp,\
 		ctrlsub.cpp,\
 		datetime.cpp,\
 		datstrm.cpp,\
 		db.cpp,\
+		dbgrid.cpp,\
 		dbtable.cpp,\
 		dcbase.cpp,\
+		dircmn.cpp,\
 		dlgcmn.cpp,\
 		dobjcmn.cpp,\
 		docmdi.cpp,\
@@ -154,6 +201,7 @@ SOURCES = \
 		ffile.cpp,\
 		file.cpp,\
 		fileconf.cpp,\
+		filename.cpp,\
 		filefn.cpp,\
 		filesys.cpp,\
 		fontcmn.cpp,\
@@ -165,17 +213,22 @@ 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,\
 		imagpnm.cpp,\
 		imagtiff.cpp,\
+		imagxpm.cpp,\
 		intl.cpp,\
 		ipcbase.cpp,\
 		layout.cpp,\
@@ -185,31 +238,38 @@ SOURCES = \
 		longlong.cpp,\
 		memory.cpp,\
 		menucmn.cpp,\
-		mimetype.cpp,\
+		mimecmn.cpp,\
 		module.cpp,\
 		mstream.cpp,\
+		nbkbase.cpp,\
 		object.cpp,\
-		objstrm.cpp,\
 		paper.cpp,\
+		popupcmn.cpp,\
 		prntbase.cpp,\
 		process.cpp,\
 		protocol.cpp,\
+		quantize.cpp,\
 		resource.cpp,\
 		sckaddr.cpp,\
 		sckfile.cpp,\
 		sckipc.cpp,\
 		sckstrm.cpp,\
-		serbase.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
+		settcmn.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,\
 		url.cpp,\
@@ -222,15 +282,30 @@ SOURCES = \
 		wincmn.cpp,\
 		wxchar.cpp,\
 		wxexpr.cpp,\
+		xpmdecod.cpp,\
 		zipstrm.cpp,\
 		zstream.cpp
 
 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
 
 parser.obj : parser.c lexer.c
@@ -253,18 +328,26 @@ 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
 ctrlcmn.obj : ctrlcmn.cpp
 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
@@ -278,6 +361,7 @@ ffile.obj : ffile.cpp
 file.obj : file.cpp
 fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
+filename.obj : filename.cpp
 filesys.obj : filesys.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
@@ -288,17 +372,22 @@ 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
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
+imagxpm.obj : imagxpm.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
@@ -308,31 +397,38 @@ log.obj : log.cpp
 longlong.obj : longlong.cpp
 memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
-mimetype.obj : mimetype.cpp
+mimecmn.obj : mimecmn.cpp
 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
+quantize.obj : quantize.cpp
 resource.obj : resource.cpp
 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
+settcmn.obj : settcmn.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
 url.obj : url.cpp
@@ -345,5 +441,6 @@ wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp
+xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp