diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-08 02:40:06 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-08 02:40:06 +0000 |
| commit | e456b4fcd62fadab5c78d94913ec408a4926279b (patch) | |
| tree | 66aa51f7fb93d4ac102614072335270ae0843cfe /config.nmake | |
| parent | 8fb030d900e7c9f0b1222e986bba076e84642a81 (diff) | |
if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
svn path=/trunk/; revision=20337
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index c5b2ec1c41..c2d5ce125d 100644 --- a/config.nmake +++ b/config.nmake @@ -174,8 +174,10 @@ PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack # # XXX - ZLIB must be recompiled on MSVC 2005 because of C runtime lib (msvcr) # problems, simply disable it for now on MSVC 2005 (and other none 6 versions) -!IF "$(MSVC_VARIANT)" == "MSVC6" +!IF "$(MSVC_VARIANT)" == "MSVC6" ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123-dll +!ELSE +ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123 !ENDIF # |