3 files changed, 25 insertions, 17 deletions
diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj
index 531e0a3..0abb1ad 100644
--- a/MSVC/Tools/Tools.vcproj
+++ b/MSVC/Tools/Tools.vcproj
@@ -17,8 +17,8 @@
 			ConfigurationType="0">
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="nmake all"
-				ReBuildCommandLine="nmake rebuild"
+				BuildCommandLine="nmake debugall"
+				ReBuildCommandLine="nmake debugrebuild"
 				CleanCommandLine="nmake clean"/>
 		</Configuration>
 		<Configuration
@@ -29,8 +29,8 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="nmake all"
-				ReBuildCommandLine="nmake clear all"
-				CleanCommandLine="nmake clear"/>
+				ReBuildCommandLine="nmake rebuild"
+				CleanCommandLine="nmake clean"/>
 		</Configuration>
 	</Configurations>
 	<Files>
diff --git a/MSVC/Tools/makefile b/MSVC/Tools/makefile
index 10ec37c..5373e4a 100644
--- a/MSVC/Tools/makefile
+++ b/MSVC/Tools/makefile
@@ -9,6 +9,12 @@ all :
   cd ..\..
   $(MAKE) /F nmakefile all
 
+debugall :
+  set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
+  set DEBUG=true
+  cd ..\..
+  $(MAKE) /F nmakefile all
+
 clean :
   set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
   cd ..\..
@@ -18,3 +24,9 @@ rebuild:
   set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
   cd ..\..
   $(MAKE) /f nmakefile clean all
+
+debugrebuild:
+  set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
+  set DEBUG=true
+  cd ..\..
+  $(MAKE) /f nmakefile clean all
diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index 07cf981..8d186b8 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -1,7 +1,3 @@
-!IFNDEF COMMONTOOLSPATH
-!ERROR Env Variable COMMONTOOLSPATH must be defined
-!ENDIF
-
 #--------------------------------------------------------------------------
 #needed so we can say foo.dll: foo.cpp and it will just work
 .SUFFIXES: .tlb .il .dll .cpp .js .cs .vb .rc .ocx .reg .resources .txt .resX .wsdl .asmx .lex
@@ -18,7 +14,7 @@ _JS=jsc.exe
 _ASSEM=ilasm.exe
 
 # Comment this line out to turn debug mode off
-DEBUG=TRUE
+#DEBUG=TRUE
 
 #--------------------------------------------------------------------------
 #Use the _MAKE_STOP environment variable if you want NMAKE to stop on error
@@ -44,22 +40,18 @@ _AL=al.exe
 _SHAREDNAME=sn.exe
 _LEX=flex.exe
 
-#IFDEF OS
-
-_MAKE_IN_DIR = $(COMMONTOOLSPATH)\MakInDir.bat
-
-#ELSE
-
 _MAKE_IN_DIR = call "$(COMMONTOOLSPATH)\MakInDir.bat"
 
-#ENDIF
-
 _GACUTIL=gacutil.exe
 _WSDL=wsdl.exe
 _XSD=xsd.exe
 
 #define our basic link line for managed code
+!IFDEF DEBUG
 _LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBC
+!ELSE
+_LINK=link.exe /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBCD
+!ENDIF
 
 #this is used for compiling C# samples
 #reset this in individual sample makefile to your imports if required
@@ -86,7 +78,11 @@ _CLEANFILES=*.obj *.tlb *.reg
 _CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL"
 
 #set debug as the default for c++
+!IFDEF DEBUG
 _CDFLAGS=$(_CFLAGS) /Zi
+!ELSE
+_CDFLAGS=$(_CFLAGS)
+!ENDIF
 
 #set some command link flags
 _LFLAGS=-noentry