Mercurial > projects > ddmd
changeset 78:b98fa8a4bf04
merge
| author | Eldar Insafutdinov <e.insafutdinov@gmail.com> |
|---|---|
| date | Sun, 29 Aug 2010 14:39:08 +0100 |
| parents | ad4792a1cfd6 (current diff) 5196b7829be2 (diff) |
| children | 43073c7c7769 |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/commands.txt Sun Aug 29 14:36:55 2010 +0100 +++ b/commands.txt Sun Aug 29 14:39:08 2010 +0100 @@ -17,7 +17,7 @@ -ofbin\ddmd.exe bridge.obj ddmd.def -dmd33\src\dmd\dmd.lib +dmd.lib main.d dbg\CallStackInfo.d dbg\Debug.d
--- a/dmd/Global.d Sun Aug 29 14:36:55 2010 +0100 +++ b/dmd/Global.d Sun Aug 29 14:39:08 2010 +0100 @@ -29,7 +29,7 @@ string ddoc_ext = "ddoc";; // for Ddoc macro include files string hdr_ext = "di"; // for D 'header' import files string copyright= "Copyright (c) 1999-2009 by Digital Mars"; - string written = "written by Walter Bright"; + string written = "written by Walter Bright, ported to D by community"; ///version (TARGET_NET) { /// "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates."; ///}
--- a/dmd/Util.d Sun Aug 29 14:36:55 2010 +0100 +++ b/dmd/Util.d Sun Aug 29 14:39:08 2010 +0100 @@ -511,7 +511,7 @@ writef( "Documentation: http://www.digitalmars.com/d/2.0/index.html\n" "Usage:\n" -" dmd files.d ... { -switch }\n" +" ddmd files.d ... { -switch }\n" "\n" " files.d D source files\n" " @cmdfile read arguments from cmdfile\n"
--- a/win32_lib.mak Sun Aug 29 14:36:55 2010 +0100 +++ b/win32_lib.mak Sun Aug 29 14:39:08 2010 +0100 @@ -98,7 +98,7 @@ OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS) -SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \ +SRCS= mars2.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \ utf.c entity.c identifier.c mtype.c expression.c optimize.c \ template.h template.c lexer.c declaration.c cast.c \ cond.h cond.c link.c aggregate.h staticassert.h parse.c statement.c \ @@ -306,7 +306,7 @@ html.obj : $(CH) $(TOTALH) $C\html.h $C\html.c $(CC) -c -I$(ROOT) $(MFLAGS) $C\html -mars.obj : $(TOTALH) module.h mars.h mars.c +mars2.obj : $(TOTALH) module.h mars.h mars2.c $(CC) -c $(CFLAGS) $(PREC) $* -Ae md5.obj : $C\md5.h $C\md5.c