Build with zlib-1.2.5 for win32

zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586

3 files changed, 17 insertions, 7 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index f0079f0a74..68d0d12081 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -621,7 +621,11 @@ $(ADNS_DLL):
 $(ZLIB_DLL):
 	xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
 	cd zlib.tmp
-	$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="$(LOCAL_CFLAGS)"
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+	$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" 
+!else
+	$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="$(LOCAL_CFLAGS)
+!endif	
 	if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR)
 	if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib
 	if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include
@@ -807,7 +811,11 @@ process_libs:
 !ENDIF
 !IFDEF ZLIB_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+		zlib125 zlib-1.2.5.zip
+!else
 		zlib123 zlib123ws.zip
+!endif
 !ENDIF
 !IFDEF LUA_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -840,7 +848,7 @@ process_libs:
 !ENDIF
 !IFDEF NASM
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		. nasm-2.02-win32.zip
+		. nasm-2.09.08-win32.zip
 !ENDIF
 !IF "$(WIN_SETUP_OPT)" == "--download"
 	@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIBS)"
@@ -880,6 +888,7 @@ clean_setup:
     rm -r -f libsmi-0.4.8
     rm -r -f nasm-2.00
     rm -r -f nasm-2.02
+    rm -r -f nasm-2.09.08
     rm -r -f pcre-6.4
     rm -r -f pcre-7.0
     rm -r -f portaudio_v19
@@ -890,6 +899,7 @@ clean_setup:
     rm -r -f AirPcap_Devpack_4_0_0_1480
     rm -r -f AirPcap_Devpack_4_1_0_1622
     rm -r -f zlib123
+    rm -r -f zlib-1.2.5
     rm -r -f zlib123-dll
     rm -r -f upx301w
     rm -r -f upx303w
diff --git a/config.nmake b/config.nmake
index c7d2981167..fa3ec64da7 100644
--- a/config.nmake
+++ b/config.nmake
@@ -142,7 +142,7 @@ MSVC_VARIANT=MSVC2008
 # If you don't have NASM, comment this line out, so that NASM
 # isn't defined.
 #
-NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
+NASM=$(WIRESHARK_LIBS)\nasm-2.09-08\nasm.exe
 
 #
 # Optional: the Python library enables scripting support.
@@ -271,8 +271,8 @@ PCAP_REMOTE=1
 #
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
-#
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+# EXperimental only use zlib 1.2.5 on win32 for now
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -822,7 +822,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
 # http://msdn.microsoft.com/en-us/library/ms182025.aspx
 
 !IFDEF ENABLE_CODE_ANALYSIS
-LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
+#LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
 !ENDIF
 
 #STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index d806baeada..41e64a8e63 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -4,7 +4,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2011-04-05"
+export DOWNLOAD_TAG="2011-04-12B"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`