diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-12 15:44:05 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-12 15:44:05 +0000 |
| commit | 5d2cafbf544b14461f6d4b2a2ff0606b8c1c9f3e (patch) | |
| tree | 061aed70303e3e40aac6ce644cbb4aa7421cc352 /config.nmake | |
| parent | 428da1d7a6bc25121522667df30a0b8110e12f41 (diff) | |
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.
*/
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36586 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
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) |