diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-04-13 04:47:38 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-04-13 04:47:38 +0000 |
| commit | 3db53e54ba5441fac248748a432f4d41561bbb34 (patch) | |
| tree | 3af561e07e3db55db8ff84b6082da335686e100e /config.nmake | |
| parent | 4b416d92d0679ec449260cd6d3b7b1d608fb550f (diff) | |
| download | wireshark-3db53e54ba5441fac248748a432f4d41561bbb34.tar.gz | |
Build win64 with a modified zlib (google is your friend).
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0
First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.
svn path=/trunk/; revision=36616
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index 75088c3a5d..ed6f42f4e7 100644 --- a/config.nmake +++ b/config.nmake @@ -7,7 +7,7 @@ # Only "win32" and "win64" are valid (for now). # This can be defined in the system environment. !IFNDEF WIRESHARK_TARGET_PLATFORM -WIRESHARK_TARGET_PLATFORM=win32 +WIRESHARK_TARGET_PLATFORM=win64 !ENDIF ##### Versions ##### @@ -479,7 +479,7 @@ 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 +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) |