X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54d06233d623a33a82866f961af5454bafa2033e..1e52188741389278cd99abf79218162c87024ba3:/src/common/descrip.mms?ds=sidebyside

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index ff1afb46ad..4d009eafbc 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -7,7 +7,6 @@
 #*****************************************************************************
 .first
 	define wx [--.include.wx]
-	set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
@@ -15,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 =
@@ -38,8 +44,10 @@ LEX=flex
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-		parser.obj,\
+		appbase.obj,\
 		appcmn.obj,\
+		artprov.obj,\
+		artstd.obj,\
 		choiccmn.obj,\
 		clipcmn.obj,\
 		clntdata.obj,\
@@ -51,6 +59,7 @@ OBJECTS = \
 		cshelp.obj,\
 		ctrlcmn.obj,\
 		ctrlsub.obj,\
+		datacmn.obj,\
 		datetime.obj,\
 		datstrm.obj,\
 		db.obj,\
@@ -73,6 +82,8 @@ OBJECTS = \
 		filename.obj,\
 		filefn.obj,\
 		filesys.obj,\
+		fldlgcmn.obj,\
+		fmapbase.obj,\
 		fontcmn.obj,\
 		fontmap.obj,\
 		framecmn.obj
@@ -83,11 +94,15 @@ OBJECTS1=fs_inet.obj,\
 		gdicmn.obj,\
 		gifdecod.obj,\
 		hash.obj,\
+		hashmap.obj,\
 		helpbase.obj,\
 		http.obj,\
+		iconbndl.obj,\
+		init.obj,\
 		imagall.obj,\
 		imagbmp.obj,\
 		image.obj,\
+		imagfill.obj,\
 		imaggif.obj,\
 		imagiff.obj,\
 		imagjpeg.obj,\
@@ -107,6 +122,7 @@ OBJECTS1=fs_inet.obj,\
 		menucmn.obj,\
 		mimecmn.obj,\
 		module.obj,\
+		msgout.obj,\
 		mstream.obj,\
 		nbkbase.obj,\
 		object.obj,\
@@ -116,14 +132,16 @@ OBJECTS1=fs_inet.obj,\
 		process.obj,\
 		protocol.obj,\
 		quantize.obj,\
-		resource.obj,\
+		rendcmn.obj,\
 		sckaddr.obj,\
 		sckfile.obj,\
 		sckipc.obj,\
 		sckstrm.obj,\
 		sizer.obj,\
 		socket.obj,\
+		settcmn.obj,\
 		statbar.obj,\
+		stopwatch.obj,\
 		strconv.obj,\
 		stream.obj,\
 		string.obj,\
@@ -138,8 +156,10 @@ OBJECTS1=fs_inet.obj,\
 		treebase.obj,\
 		txtstrm.obj,\
 		unzip.obj,\
-		url.obj,\
-		utilscmn.obj,\
+		url.obj
+
+OBJECTS2=utilscmn.obj,\
+		rgncmn.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
@@ -147,15 +167,18 @@ OBJECTS1=fs_inet.obj,\
 		wfstream.obj,\
 		wincmn.obj,\
 		wxchar.obj,\
-		wxexpr.obj
-
-OBJECTS2=xpmdecod.obj,\
+		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
+OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+
 SOURCES = \
-		parser.y,\
+		appbase.cpp,\
 		appcmn.cpp,\
+		artprov.cpp,\
+		artstd.cpp,\
+		bmpbase.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
 		clntdata.cpp,\
@@ -167,6 +190,7 @@ SOURCES = \
 		cshelp.cpp,\
 		ctrlcmn.cpp,\
 		ctrlsub.cpp,\
+		datacmn.cpp,\
 		datetime.cpp,\
 		datstrm.cpp,\
 		db.cpp,\
@@ -189,20 +213,27 @@ SOURCES = \
 		filename.cpp,\
 		filefn.cpp,\
 		filesys.cpp,\
+		fldlgcmn.cpp,\
+		fmapbase.cpp,\
 		fontcmn.cpp,\
 		fontmap.cpp,\
 		framecmn.cpp,\
 		fs_inet.cpp,\
 		fs_zip.cpp,\
 		ftp.cpp,\
+		gaugecmn.cpp,\
 		gdicmn.cpp,\
 		gifdecod.cpp,\
 		hash.cpp,\
+		hashmap.cpp,\
 		helpbase.cpp,\
 		http.cpp,\
+		iconbndl.cpp,\
+		init.cpp,\
 		imagall.cpp,\
 		imagbmp.cpp,\
 		image.cpp,\
+		imagfill.cpp,\
 		imaggif.cpp,\
 		imagiff.cpp,\
 		imagjpeg.cpp,\
@@ -222,6 +253,7 @@ SOURCES = \
 		menucmn.cpp,\
 		mimecmn.cpp,\
 		module.cpp,\
+		msgout.cpp,\
 		mstream.cpp,\
 		nbkbase.cpp,\
 		object.cpp,\
@@ -231,14 +263,17 @@ SOURCES = \
 		process.cpp,\
 		protocol.cpp,\
 		quantize.cpp,\
-		resource.cpp,\
+		rendcmn.cpp,\
+		rgncmn.cpp,\
 		sckaddr.cpp,\
 		sckfile.cpp,\
 		sckipc.cpp,\
 		sckstrm.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
+		settcmn.cpp,\
 		statbar.cpp,\
+		stopwatch.cpp,\
 		strconv.cpp,\
 		stream.cpp,\
 		sysopt.cpp,\
@@ -262,7 +297,6 @@ SOURCES = \
 		wfstream.cpp,\
 		wincmn.cpp,\
 		wxchar.cpp,\
-		wxexpr.cpp,\
 		xpmdecod.cpp,\
 		zipstrm.cpp,\
 		zstream.cpp
@@ -272,37 +306,30 @@ all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 	library [--.lib]libwx_motif.olb $(OBJECTS1)
 	library [--.lib]libwx_motif.olb $(OBJECTS2)
+	library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .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
-	$(YACC) parser.y
-	pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \
-	$(SED) -e "s/BUFSIZ/5000/g"            | \
-	$(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-	$(SED) -e "s/yy/PROIO_yy/g"            | \
-	$(SED) -e "s/input/PROIO_input/g"      | \
-	$(SED) -e "s/unput/PROIO_unput/g"      > parser.c
-	delete y_tab.c;*
-
-lexer.c : lexer.l
-	$(LEX) lexer.l
-	pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \
-	$(SED) -e "s/yy/PROIO_yy/g"            | \
-	$(SED) -e "s/input/PROIO_input/g"      | \
-	$(SED) -e "s/unput/PROIO_unput/g"      > lexer.c
-	delete lexyy.c;*
-
+appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
+artprov.obj : artprov.cpp
+artstd.obj : artstd.cpp
+bmpbase.obj : bmpbase.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
@@ -314,6 +341,7 @@ containr.obj : containr.cpp
 cshelp.obj : cshelp.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
+datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
@@ -336,20 +364,27 @@ fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
 filesys.obj : filesys.cpp
+fldlgcmn.obj : fldlgcmn.cpp
+fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 fs_zip.obj : fs_zip.cpp
 ftp.obj : ftp.cpp
+gaugecmn.obj : gaugecmn.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
+init.obj : init.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
@@ -369,6 +404,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
@@ -378,14 +414,17 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
-resource.obj : resource.cpp
+rendcmn.obj : rendcmn.cpp
+rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
 sckstrm.obj : sckstrm.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
+settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
+stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
@@ -409,7 +448,6 @@ variant.obj : variant.cpp
 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