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 /Makefile.nmake | |
| 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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 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 |