--- ..\zlib-1.2.3-orig\win32/zlib1.rc Sun Jul 17 21:35:36 2005 +++ win32/zlib1.rc Mon May 01 01:24:48 2006 @@ -5,15 +5,15 @@ #else VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE #endif - FILEVERSION 1,2,2,0 - PRODUCTVERSION 1,2,2,0 + FILEVERSION 1,2,3,0 + PRODUCTVERSION 1,2,3,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS 1 #else FILEFLAGS 0 #endif - FILEOS VOS_DOS_WINDOWS32 + FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL FILESUBTYPE 0 // not used BEGIN --- ..\zlib-1.2.3-orig\win32\Makefile.msc Tue Aug 26 23:42:00 2003 +++ win32\Makefile.msc Wed May 03 12:37:45 2006 @@ -27,9 +27,9 @@ LD = link AR = lib RC = rc -CFLAGS = -nologo -MD -O2 $(LOC) +CFLAGS = -nologo -MD -W3 -wd4996 -Zi -Fd"zlib_src" -O2 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE $(LOC) ASFLAGS = -coff -LDFLAGS = -nologo -release +LDFLAGS = -nologo -debug -incremental:no -opt:ref ARFLAGS = -nologo RCFLAGS = /dWIN32 /r @@ -50,18 +50,28 @@ $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \ -out:$@ $(OBJS) $(OBJA) zlib1.res + if exist $@.manifest \ + mt -nologo -manifest $@.manifest -outputresource:$@;2 example.exe: example.obj $(STATICLIB) $(LD) $(LDFLAGS) example.obj $(STATICLIB) + if exist $@.manifest \ + mt -nologo -manifest $@.manifest -outputresource:$@;1 minigzip.exe: minigzip.obj $(STATICLIB) $(LD) $(LDFLAGS) minigzip.obj $(STATICLIB) + if exist $@.manifest \ + mt -nologo -manifest $@.manifest -outputresource:$@;1 example_d.exe: example.obj $(IMPLIB) $(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB) + if exist $@.manifest \ + mt -nologo -manifest $@.manifest -outputresource:$@;1 minigzip_d.exe: minigzip.obj $(IMPLIB) $(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB) + if exist $@.manifest \ + mt -nologo -manifest $@.manifest -outputresource:$@;1 .c.obj: $(CC) -c $(CFLAGS) $< @@ -116,11 +126,7 @@ # cleanup clean: - -del $(STATICLIB) - -del $(SHAREDLIB) - -del $(IMPLIB) - -del *.obj - -del *.res - -del *.exp - -del *.exe - -del foo.gz + -for %f in ( $(STATICLIB)? $(SHAREDLIB)? $(IMPLIB)? foo.gz? \ + *.obj *.res *.exp *.exe *.pdb *.manifest ) do ( \ + del %f \ + )