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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index de1e7ff2c6..f9f2137e87 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)\
@@ -19,10 +18,17 @@ 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
 .else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)
+.else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 YACC=bison/yacc
 
@@ -38,22 +44,30 @@ LEX=flex
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-		parser.obj,\
+		appbase.obj,\
 		appcmn.obj,\
+		artprov.obj,\
+		artstd.obj,\
+		bookctrl.obj,\
 		choiccmn.obj,\
 		clipcmn.obj,\
+		clntdata.obj,\
 		cmdline.obj,\
+		cmdproc.obj,\
 		cmndata.obj,\
 		config.obj,\
 		containr.obj,\
 		cshelp.obj,\
 		ctrlcmn.obj,\
 		ctrlsub.obj,\
+		datacmn.obj,\
 		datetime.obj,\
 		datstrm.obj,\
 		db.obj,\
+		dbgrid.obj,\
 		dbtable.obj,\
 		dcbase.obj,\
+		dircmn.obj,\
 		dlgcmn.obj,\
 		dobjcmn.obj,\
 		docmdi.obj,\
@@ -69,22 +83,29 @@ OBJECTS = \
 		filename.obj,\
 		filefn.obj,\
 		filesys.obj,\
+		fldlgcmn.obj,\
+		fmapbase.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,\
+		init.obj,\
 		imagall.obj,\
 		imagbmp.obj,\
 		image.obj,\
+		imagfill.obj,\
 		imaggif.obj,\
+		imagiff.obj,\
 		imagjpeg.obj,\
 		imagpcx.obj,\
 		imagpng.obj,\
@@ -102,66 +123,88 @@ OBJECTS1=framecmn.obj,\
 		menucmn.obj,\
 		mimecmn.obj,\
 		module.obj,\
+		msgout.obj,\
 		mstream.obj,\
 		nbkbase.obj,\
 		object.obj,\
-		objstrm.obj,\
 		paper.obj,\
+		popupcmn.obj,\
 		prntbase.obj,\
 		process.obj,\
 		protocol.obj,\
 		quantize.obj,\
-		resource.obj,\
+		rendcmn.obj,\
 		sckaddr.obj,\
 		sckfile.obj,\
 		sckipc.obj,\
 		sckstrm.obj,\
-		serbase.obj,\
 		sizer.obj,\
 		socket.obj,\
+		settcmn.obj,\
+		statbar.obj,\
+		stopwatch.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,\
+		rgncmn.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
 		variant.obj,\
 		wfstream.obj,\
-		wincmn.obj,\
 		wxchar.obj,\
-		wxexpr.obj,\
+		wincmn.obj,\
 		xpmdecod.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
+OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+
+OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
+	dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
+	gbsizer.obj,geometry.obj,gzstream.obj,matrix.obj,radiocmn.obj,\
+	regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
+
 SOURCES = \
-		parser.y,\
+		appbase.cpp,\
 		appcmn.cpp,\
+		artprov.cpp,\
+		artstd.cpp,\
+		bmpbase.cpp,\
+		bookctrl.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
+		clntdata.cpp,\
 		cmdline.cpp,\
+		cmdproc.cpp,\
 		cmndata.cpp,\
 		config.cpp,\
 		containr.cpp,\
 		cshelp.cpp,\
 		ctrlcmn.cpp,\
 		ctrlsub.cpp,\
+		datacmn.cpp,\
 		datetime.cpp,\
 		datstrm.cpp,\
 		db.cpp,\
+		dbgrid.cpp,\
 		dbtable.cpp,\
 		dcbase.cpp,\
+		dircmn.cpp,\
 		dlgcmn.cpp,\
 		dobjcmn.cpp,\
 		docmdi.cpp,\
@@ -177,21 +220,29 @@ 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,\
 		imagpcx.cpp,\
 		imagpng.cpp,\
@@ -209,32 +260,38 @@ SOURCES = \
 		menucmn.cpp,\
 		mimecmn.cpp,\
 		module.cpp,\
+		msgout.cpp,\
 		mstream.cpp,\
 		nbkbase.cpp,\
 		object.cpp,\
-		objstrm.cpp,\
 		paper.cpp,\
+		popupcmn.cpp,\
 		prntbase.cpp,\
 		process.cpp,\
 		protocol.cpp,\
 		quantize.cpp,\
-		resource.cpp,\
+		rendcmn.cpp,\
+		rgncmn.cpp,\
 		sckaddr.cpp,\
 		sckfile.cpp,\
 		sckipc.cpp,\
 		sckstrm.cpp,\
-		serbase.cpp,\
 		sizer.cpp,\
 		socket.cpp,\
+		settcmn.cpp,\
+		statbar.cpp,\
+		stopwatch.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,\
@@ -247,58 +304,79 @@ SOURCES = \
 		wfstream.cpp,\
 		wincmn.cpp,\
 		wxchar.cpp,\
-		wxexpr.cpp,\
 		xpmdecod.cpp,\
 		zipstrm.cpp,\
-		zstream.cpp
+		zstream.cpp,\
+		accesscmn.cpp,\
+		dndcmn.cpp,\
+		dpycmn.cpp,\
+		dseldlg.cpp,\
+		dynload.cpp,\
+		effects.cpp,\
+		fddlgcmn.cpp,\
+		fs_mem.cpp,\
+		gbsizer.cpp,\
+		geometry.cpp,\
+		gzstream.cpp,\
+		matrix.cpp,\
+		radiocmn.cpp,\
+		regex.cpp,\
+		taskbarcmn.cpp,\
+		xti.cpp,\
+		xtistrm.cpp,\
+		xtixml.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 	$(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__
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
 	library [--.lib]libwx_gtk.olb $(OBJECTS1)
+	library [--.lib]libwx_gtk.olb $(OBJECTS2)
+.else
+.ifdef __WXX11__
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
+.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
+bookctrl.obj : bookctrl.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
+datacmn.obj : datacmn.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
@@ -314,21 +392,29 @@ 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
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
@@ -346,32 +432,38 @@ 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
-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
+rendcmn.obj : rendcmn.cpp
+rgncmn.obj : rgncmn.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
+stopwatch.obj : stopwatch.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
@@ -384,7 +476,24 @@ 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
+accesscmn.obj : accesscmn.cpp
+dndcmn.obj : dndcmn.cpp
+dpycmn.obj : dpycmn.cpp
+dseldlg.obj : dseldlg.cpp
+dynload.obj : dynload.cpp
+effects.obj : effects.cpp
+fddlgcmn.obj : fddlgcmn.cpp
+fs_mem.obj : fs_mem.cpp
+gbsizer.obj : gbsizer.cpp
+geometry.obj : geometry.cpp
+gzstream.obj : gzstream.cpp
+matrix.obj : matrix.cpp
+radiocmn.obj : radiocmn.cpp
+regex.obj : regex.cpp
+taskbarcmn.obj : taskbarcmn.cpp
+xti.obj : xti.cpp
+xtistrm.obj : xtistrm.cpp
+xtixml.obj : xtixml.cpp