diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-13 04:47:38 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-13 04:47:38 +0000 |
| commit | 0ebda8f147e6a07f97e8930683c1e57cde81d9c9 (patch) | |
| tree | 3af561e07e3db55db8ff84b6082da335686e100e | |
| parent | 5ad7441f9dcd74084ffee21b7e7e3f26dfec0efd (diff) | |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36616 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 6 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 68d0d12081..5468f980e8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -624,7 +624,7 @@ $(ZLIB_DLL): !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) + $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-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 @@ -814,7 +814,7 @@ process_libs: !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" zlib125 zlib-1.2.5.zip !else - zlib123 zlib123ws.zip + zlib125 zlib125ws.zip !endif !ENDIF !IFDEF LUA_DIR 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) diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 565c46e83f..4d5b5bf984 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -4,7 +4,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-04-12" +export DOWNLOAD_TAG="2011-04-13" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |