# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1323558676 0
# Node ID 5417b312801e1d7dc83439f0fa4731729915b403
# Parent  0d4fdf646caf149e3cdd4705098e434b65d8fa36
Add -DISOLATION_AWARE_ENABLED=1 to Visual C compile flags and delete temporary manifest files after build.

diff -r 0d4fdf646caf -r 5417b312801e makefile.vc
--- a/makefile.vc	Fri Dec 09 21:24:31 2011 +0000
+++ b/makefile.vc	Sat Dec 10 23:11:16 2011 +0000
@@ -58,7 +58,7 @@
 !endif
 
 CC = cl
-CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION)
+CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION)
 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib
 RES =
 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
@@ -76,7 +76,7 @@
 
 
 clean:
-	-erase *.dll
+        -erase *.dll
         -erase *.exe
         -erase *.opt
         -erase *.lib
@@ -101,6 +101,7 @@
 <<
 	lib /def:$(DEFFILE) /out:dw.lib
 	mt.exe /manifest dw.dll.manifest win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2
+	-erase dw.dll.manifest
         copy dw.lib $(DWLIBDIR)\dw.lib
         copy dw.dll $(DWDLLDIR)\dw.dll
 
@@ -115,6 +116,7 @@
 <<
 	lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib
 	mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2
+	-erase dwcompat.dll.manifest
         copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
         copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
 
@@ -141,6 +143,7 @@
 dwtest.exe: dwtest.obj winmain.obj
 	$(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS)
 	mt.exe /manifest dwtest.exe.manifest win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1
+	-erase dwtest.exe.manifest
 
 zip: dw.dll
 	copy win\readme-win.txt .