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 /tools | |
| parent | 4b416d92d0679ec449260cd6d3b7b1d608fb550f (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.
svn path=/trunk/; revision=36616
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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/` |