diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-06 10:31:51 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-06 21:34:10 +0000 |
| commit | ec8ed1511a012b2801b4b68f13c97a06daccdf87 (patch) | |
| tree | fd0eb8cd478d9a65b961ceee37486e3210ac13c9 /Makefile.nmake | |
| parent | 0ef2fd5d532b06cd6ae1ab2823b04b89f68bc253 (diff) | |
Use zlib 1.2.8 on Windows.
Change-Id: I3df88b1e891f43cd6b6ed089f6c3d20a942e68bc
Reviewed-on: https://code.wireshark.org/review/7952
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e2193657c4..a66ece3279 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -772,9 +772,9 @@ $(ZLIB_DLL): xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y cd zlib.tmp !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" + $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-I. -DASMV -DASMINF" OBJA="inffas32.obj match686.obj" !else - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" + $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-I. -DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" !endif if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR) if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib @@ -784,8 +784,8 @@ $(ZLIB_DLL): !ENDIF copy zlib1.dll $(ZLIB_DIR) copy zdll.lib $(ZLIB_DIR)\lib - copy zconf.h $(ZLIB_DIR)\include - copy zlib.h $(ZLIB_DIR)\include + copy zconf.h $(ZLIB_DIR) + copy zlib.h $(ZLIB_DIR) cd .. rm -r -f zlib.tmp !ENDIF @@ -1033,13 +1033,8 @@ process_libs: !ENDIF !IFDEF ZLIB_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ -!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - zlib125 zlib-1.2.5.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!else - zlib125 zlib125ws.zip \ + . zlib128.zip \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!endif !ENDIF !IFDEF LUA_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ |