--- a/commands.txt	Sat Aug 28 10:51:32 2010 +0400
+++ b/commands.txt	Sat Aug 28 16:14:07 2010 +0200
@@ -14,10 +14,10 @@
 -version=SEH
 -version=OMFOBJ
 -version=SNAN_DEFAULT_INIT
--ofC:\dmd2.032\windows\bin\dmd.exe
+-ofbin\dmd.exe
 bridge.obj
 ddmd.def
-C:\dmd2.032\src\dmd\dmd.lib
+dmd.lib
 main.d
 dbg\CallStackInfo.d
 dbg\Debug.d

--- a/win32_lib.mak	Sat Aug 28 10:51:32 2010 +0400
+++ b/win32_lib.mak	Sat Aug 28 16:14:07 2010 +0200
@@ -68,7 +68,7 @@
 
 # D front end
 
-OBJ1= mars2.obj enum.obj struct.obj dsymbol.obj import.obj id.obj \
+OBJ1= mars.obj enum.obj struct.obj dsymbol.obj import.obj id.obj \
 	staticassert.obj identifier.obj mtype.obj expression.obj \
 	optimize.obj template.obj lexer.obj declaration.obj cast.obj \
 	init.obj func.obj utf.obj unialpha.obj parse.obj statement.obj \
@@ -98,7 +98,7 @@
 
 OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
 
-SRCS= mars2.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \
+SRCS= mars.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
 
-mars2.obj : $(TOTALH) module.h mars.h mars2.c
+mars.obj : $(TOTALH) module.h mars.h mars.c
 	$(CC) -c $(CFLAGS) $(PREC) $* -Ae
 
 md5.obj : $C\md5.h $C\md5.c