forked from osmocom/wireshark
Add preliminary support for Win64 compilation. Attempt to use the same
set of makefiles and scripts for each platform as much as possible. svn path=/trunk/; revision=27633
This commit is contained in:
Gerald Combs
parent
b43af91fe0
commit
8f69ddeb00
149
Makefile.nmake
149
Makefile.nmake
|
|
@ -15,7 +15,9 @@ CC = cl
|
|||
LINK= link
|
||||
BSCMAKE= bscmake
|
||||
|
||||
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
|
||||
WIN_SETUP=tools\$(PLATFORM)-setup.sh
|
||||
|
||||
LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS)
|
||||
|
||||
CFLAGS=-WX -DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
|
||||
$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
|
||||
|
|
@ -676,19 +678,19 @@ REQUIRED_TOOLS=\
|
|||
wget
|
||||
|
||||
verify_tools:
|
||||
@$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
|
||||
@$(SH) $(WIN_SETUP) --appverify $(REQUIRED_TOOLS)
|
||||
|
||||
# Targets and etc used to verify or download libraries
|
||||
|
||||
!IFNDEF WIN32_SETUP_OPT
|
||||
WIN32_SETUP_OPT=--download
|
||||
!IFNDEF WIN_SETUP_OPT
|
||||
WIN_SETUP_OPT=--download
|
||||
!ENDIF
|
||||
|
||||
# Verify that the required library 'package' (zip) files have been downloaded.
|
||||
# (It seems reasonable to assume that if the files have been downloaded
|
||||
# then they have been installed).
|
||||
check_libs:
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN32_SETUP_OPT=--libverify process_libs
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN_SETUP_OPT=--libverify process_libs
|
||||
|
||||
# Verify library packages only if Makefile.nmake has been updated
|
||||
# (or dummy file doesn't exist because of 'make clean' or whatever)
|
||||
|
|
@ -698,7 +700,7 @@ check_libs:
|
|||
# (One microsec is added to the makefile.nmake time since the time set by [cygwin ?] 'touch --reference'
|
||||
# apparently has the nanosecs truncated from the reference file time [at least on Windows Vista]).
|
||||
$(LIBS_CHECK): Makefile.nmake
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN32_SETUP_OPT=--libverify process_libs
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN_SETUP_OPT=--libverify process_libs
|
||||
@touch --reference=Makefile.nmake -d "+0.000001 sec" $@
|
||||
|
||||
# Download (if needed) and install all the required libraries into WIRESHARK_LIBS.
|
||||
|
|
@ -708,148 +710,129 @@ setup: verify_tools clean_setup process_libs
|
|||
|
||||
|
||||
# The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
|
||||
# (The choice is determined by the value of the macro WIN32_SETUP_OPT).
|
||||
# (The choice is determined by the value of the macro WIN_SETUP_OPT).
|
||||
process_libs:
|
||||
!IF "$(WIN32_SETUP_OPT)" == "--libverify"
|
||||
@$(SH) tools\win32-setup.sh --checktag "$(WIRESHARK_LIBS)"
|
||||
!IF "$(WIN_SETUP_OPT)" == "--libverify"
|
||||
@$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIBS)"
|
||||
!ENDIF
|
||||
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
|
||||
!IF "$(GTK_INST_VERSION)" == "2.14"
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk2.14/glib_2.18.4-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk2.14/glib-dev_2.18.4-1_win32.zip
|
||||
!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk2.12/glib_2.18.0-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk2.12/glib-dev_2.18.0-1_win32.zip
|
||||
!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk$(GTK_INST_VERSION)/glib_$(GLIB_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
glib gtk$(GTK_INST_VERSION)/glib-dev_$(GLIB_PKG)_$(PLATFORM).zip
|
||||
!ELSE
|
||||
!ERROR ? Unknown or invalid GTK_INST_VERSION
|
||||
!ENDIF
|
||||
!IFDEF ICONV_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
|
||||
!ENDIF
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
!IF "(PLATFORM)" == "win32"
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip
|
||||
!ELSE
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gettext-0.17-1 gettext_0.17-1_win64.zip
|
||||
!ENDIF
|
||||
!IFDEF KFW_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
kfw-2.5 kfw-2.5.zip
|
||||
!ENDIF
|
||||
!IFDEF PCAP_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. WpdPack_4_0_2.zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. WpdPack_$(PCAP_VERSION).zip
|
||||
!ENDIF
|
||||
!IFDEF AIRPCAP_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
AirPcap_Devpack_1_0_0_594 AirPcap_Devpack_1_0_0_594.zip
|
||||
!ENDIF
|
||||
!IFDEF C_ARES_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. c-ares-1.6.0ws.zip
|
||||
!ENDIF
|
||||
!IFDEF ADNS_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. adns-1.0-win32-05ws.zip
|
||||
!ENDIF
|
||||
!IFDEF PCRE_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
pcre-7.0 pcre-7.0-bin.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
pcre-7.0 pcre-7.0-lib.zip
|
||||
!ENDIF
|
||||
!IFDEF ZLIB_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
zlib123 zlib123ws.zip
|
||||
!ENDIF
|
||||
!IFDEF LUA_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
lua5.1.4 lua5_1_4_Win32_dll6_lib.zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
lua5.1.4 lua$(LUA_DIST)_lib.zip
|
||||
!ENDIF
|
||||
|
||||
!IFDEF GNUTLS_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. gnutls-2.6.4-1.zip
|
||||
!ENDIF
|
||||
!IFDEF PORTAUDIO_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. portaudio_v19_2.zip
|
||||
!ENDIF
|
||||
!IFDEF SMI_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. libsmi-0.4.8.zip
|
||||
!ENDIF
|
||||
!IFDEF GEOIP_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. GeoIP-1.4.5ws.zip
|
||||
!ENDIF
|
||||
|
||||
!IFDEF GTK_DIR
|
||||
!IF "$(GTK_INST_VERSION)" == "2.14"
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/gtk+_2.14.7-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/gtk+-dev_2.14.7-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/cairo_1.8.6-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/cairo-dev_1.8.6-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/atk_1.24.0-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/atk-dev_1.24.0-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/libpng_1.2.32-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/tiff-3.8.2-1-bin.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/jpeg-6b-4-bin.zip
|
||||
!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/gtk+-2.12.11.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/gtk+-dev-2.12.11.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/cairo-1.6.4-2.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/cairo-dev-1.6.4-2.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/atk-1.22.0.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/atk-dev-1.22.0.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/libpng-1.2.29.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/tiff-3.8.2-1-bin.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.12/jpeg-6b-4-bin.zip
|
||||
!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/gtk+_$(GTK_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/gtk+-dev_$(GTK_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/cairo_$(CAIRO_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/cairo-dev_$(CAIRO_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/atk_$(ATK_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/atk-dev_$(ATK_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/libpng_$(LIBPNG_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/$(TIFF_PKG).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/$(JPEG_PKG).zip
|
||||
!ELSE
|
||||
!ERROR ? Unknown or invalid GTK_INST_VERSION
|
||||
!ENDIF
|
||||
!IF "$(PANGO_INST_VERSION)" == "1.22"
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/pango_1.22.2-1_win32.zip
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk2.14/pango-dev_1.22.2-1_win32.zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/pango_$(PANGO_PKG)_$(PLATFORM).zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
gtk2 gtk$(GTK_INST_VERSION)/pango-dev_$(PANGO_PKG)_$(PLATFORM).zip
|
||||
!ELSE
|
||||
!ERROR ? Unknown or invalid PANGO_INST_VERSION
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!IFDEF HHC_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
user-guide user-guide-24665.zip
|
||||
!ENDIF
|
||||
!IFDEF UPX
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. upx301w.zip
|
||||
!ENDIF
|
||||
!IFDEF NASM
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. nasm-2.02-win32.zip
|
||||
!ENDIF
|
||||
!IF "$(WIN32_SETUP_OPT)" == "--download"
|
||||
@$(SH) tools\win32-setup.sh --settag "$(WIRESHARK_LIBS)"
|
||||
!IF "$(WIN_SETUP_OPT)" == "--download"
|
||||
@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIBS)"
|
||||
!ENDIF
|
||||
@echo.
|
||||
@echo Wireshark is ready to build.
|
||||
|
|
|
|||
242
config.nmake
242
config.nmake
|
|
@ -4,7 +4,7 @@
|
|||
# in the file README.win32 and the Developer's Guide (available online).
|
||||
|
||||
##### Target platform #####
|
||||
# Only "win32" is valid (for now).
|
||||
# Only "win32" and "win64" are valid (for now).
|
||||
# This can be defined in the system environment.
|
||||
!IFNDEF PLATFORM
|
||||
PLATFORM=win32
|
||||
|
|
@ -61,6 +61,8 @@ CPU=i386
|
|||
!else if "$(PLATFORM)" == "win64"
|
||||
TARGET_MACHINE=X64
|
||||
CPU=AMD64
|
||||
!else
|
||||
!ERROR Your mysterious moon-man architecture "$(PLATFORM)" frightens and confuses us.
|
||||
!endif
|
||||
|
||||
|
||||
|
|
@ -125,14 +127,15 @@ MSVC_VARIANT=MSVC2008
|
|||
NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
|
||||
|
||||
|
||||
##### Libraries #####
|
||||
|
||||
!if "$(PLATFORM)" == "win32"
|
||||
##### Win32 Libraries #####
|
||||
#
|
||||
# Mandatory: GLib settings
|
||||
#
|
||||
# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
|
||||
#
|
||||
GLIB_VERSION=2.0
|
||||
GLIB_PKG=2.18.4-1
|
||||
GLIB_DIR=$(WIRESHARK_LIBS)\glib
|
||||
|
||||
#
|
||||
|
|
@ -144,6 +147,13 @@ GLIB_DIR=$(WIRESHARK_LIBS)\glib
|
|||
# directory in which the "include" and "lib" directories reside.
|
||||
#
|
||||
GTK_DIR=$(WIRESHARK_LIBS)\gtk2
|
||||
GTK_PKG=2.14.7-1
|
||||
CAIRO_PKG=1.8.6-1
|
||||
ATK_PKG=1.24.0-1
|
||||
LIBPNG_PKG=1.2.32-1
|
||||
TIFF_PKG=tiff-3.8.2-1-bin
|
||||
JPEG_PKG=jpeg-6b-4-bin
|
||||
PANGO_PKG=1.22.0
|
||||
|
||||
#
|
||||
# Mandatory: Version numbers of GTK and pango.
|
||||
|
|
@ -164,6 +174,7 @@ PANGO_INST_VERSION=1.22
|
|||
# If you don't have the WPdpack, comment this line out, so that
|
||||
# PCAP_DIR isn't defined.
|
||||
#
|
||||
PCAP_VERSION=4_0_2
|
||||
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
|
||||
|
||||
#
|
||||
|
|
@ -270,6 +281,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
|
|||
# If you don't have LUA, comment this line out, so that LUA_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
LUA_DIST=5_1_4_Win32_dll6
|
||||
LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
|
||||
|
||||
#
|
||||
|
|
@ -337,6 +349,230 @@ SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
|
|||
GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
|
||||
!ENDIF
|
||||
|
||||
!else
|
||||
##### Win64 Libraries #####
|
||||
#
|
||||
# Mandatory: GLib settings
|
||||
#
|
||||
# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
|
||||
#
|
||||
GLIB_VERSION=2.0
|
||||
GLIB_PKG=2.18.4-1
|
||||
GLIB_DIR=$(WIRESHARK_LIBS)\glib
|
||||
|
||||
#
|
||||
# Mandatory: GTK (& related libs) settings
|
||||
#
|
||||
# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
|
||||
#
|
||||
# If you want building with GTK+, set GTK_DIR to the pathname of the
|
||||
# directory in which the "include" and "lib" directories reside.
|
||||
#
|
||||
GTK_DIR=$(WIRESHARK_LIBS)\gtk2
|
||||
GTK_PKG=2.14.7-1
|
||||
CAIRO_PKG=1.8.6-1
|
||||
ATK_PKG=1.24.0-1
|
||||
LIBPNG_PKG=1.2.34-1
|
||||
TIFF_PKG=libtiff_3.8.2-1_win64
|
||||
JPEG_PKG=jpeg_6b-2_win64
|
||||
PANGO_PKG=1.22.4-1
|
||||
|
||||
#
|
||||
# Mandatory: Version numbers of GTK and pango.
|
||||
#
|
||||
# (MAJOR + MINOR Version number but without MICRO version number)
|
||||
# These macros are used by the nsis installer script and by the setup target.
|
||||
#
|
||||
# GTK 2.12 is the mainline since Wireshark 0.99.7
|
||||
GTK_INST_VERSION=2.14
|
||||
PANGO_INST_VERSION=1.22
|
||||
|
||||
#
|
||||
# Optional: WinPcap developer's pack to capture network traffic.
|
||||
#
|
||||
# If you have the WinPcap developer's pack (at least version 3.0),
|
||||
# set this to the directory in which the WinPcap developer's pack resides.
|
||||
#
|
||||
# If you don't have the WPdpack, comment this line out, so that
|
||||
# PCAP_DIR isn't defined.
|
||||
#
|
||||
PCAP_VERSION=4_1_beta5
|
||||
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
|
||||
|
||||
#
|
||||
# Optional: WinPcap remote capture support and new API
|
||||
# (pcap_open(), pcap_findalldevs_ex(), etc.)
|
||||
#
|
||||
PCAP_REMOTE=1
|
||||
|
||||
#
|
||||
# Optional: The ZLib enables unzipping of gzip compressed capture files
|
||||
# "on the fly".
|
||||
#
|
||||
# If you have Zlib, set this to directory in which the Zlib headers
|
||||
# and .lib file are stored.
|
||||
#
|
||||
# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
|
||||
# defined.
|
||||
#
|
||||
ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
|
||||
|
||||
#
|
||||
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
|
||||
# name resolvings.
|
||||
#
|
||||
# If you have GNU ADNS, set this to the directory in which the GNU ADNS
|
||||
# .lib file is stored.
|
||||
#
|
||||
# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
# If C_ARES_DIR is defined below, it will override this setting.
|
||||
#
|
||||
#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
|
||||
|
||||
#
|
||||
# Optional: the c-ares library enables asynchronous (nonblocking) DNS
|
||||
# name resolvings.
|
||||
#
|
||||
# If you have c-ares, set this to the directory in which the c-ares
|
||||
# .lib file is stored. Setting this will override ADNS_DIR above. You
|
||||
# can't have both.
|
||||
#
|
||||
# If you're using Visual C++ 6.0, you'll have to use a platform SDK that
|
||||
# defines socklen_t, such as Windows Server 2003 PSDK.
|
||||
#
|
||||
# If you don't have c-ares, comment this line out, so that C_ARES_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
#C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.2ws
|
||||
|
||||
#
|
||||
# Optional: the PCRE (Perl Compatible Regular Expressions) library
|
||||
# enables regular expressions for display filters.
|
||||
#
|
||||
# If you have the PCRE library, set this to the directory in which
|
||||
# the GNUWIN32 pcre-lib package is stored.
|
||||
#
|
||||
# If you don't have PCRE, comment this line out, so that PCRE_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
|
||||
|
||||
#
|
||||
# Optional: the GNUTLS library enables ssl decryption.
|
||||
#
|
||||
# If you have the GNUTLS library, set this to the directory where
|
||||
# the lib and include files are stored.
|
||||
#
|
||||
# If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
# Platform SDK conflicts with openssl.h header
|
||||
#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
|
||||
#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1
|
||||
|
||||
#
|
||||
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
|
||||
#
|
||||
# If you have the kerberos for windows (mit) library, set this to the
|
||||
# directory where the kfw package is stored.
|
||||
#
|
||||
# If you don't have KFW, comment this line out, so that KFW_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
#KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
|
||||
|
||||
#
|
||||
# Optional: the Nettle library enables ??? decryption.
|
||||
#
|
||||
# If you have the Nettle encryption library, set this to the
|
||||
# directory in which the nettle package is stored.
|
||||
#
|
||||
# If you don't have Nettle, comment this line out, so that NETTLE_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
|
||||
|
||||
#
|
||||
# Optional: the LUA library enables scripting support.
|
||||
#
|
||||
# If you have the LUA library, set this to the directory in which
|
||||
# the LUA package is stored.
|
||||
#
|
||||
# If you don't have LUA, comment this line out, so that LUA_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
LUA_DIST=5_1_4_Win64_dll9
|
||||
LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
|
||||
|
||||
#
|
||||
# Optional: the PORTAUDIO library enables audio output for RTP streams.
|
||||
#
|
||||
# If you have the PORTAUDIO library (used for rtp_player), set this to
|
||||
# the directory in which the PORTAUDIO library is stored.
|
||||
#
|
||||
# If you don't have PORTAUDIO, comment this line out, so that
|
||||
# PORTAUDIO_DIR isn't defined.
|
||||
#
|
||||
#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
|
||||
PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
|
||||
|
||||
#
|
||||
# Version number of PortAudio
|
||||
#
|
||||
#PORTAUDIO_VERSION=18
|
||||
PORTAUDIO_VERSION=19
|
||||
|
||||
#
|
||||
# Iconv: Mandatory for Glib >= 2 and <= 2.14.4
|
||||
# [win-iconv statically linked as part of Glib >= 2.14.5]
|
||||
# Set ICONV_DIR to the directory in which the
|
||||
# ICONV include files and library resides.
|
||||
#
|
||||
##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
|
||||
|
||||
#
|
||||
# Mandatory for GTK >= 2: Gettext
|
||||
#
|
||||
# Set GETTEXT_DIR to the directory in which the
|
||||
# GETTEXT include files and library resides.
|
||||
#
|
||||
#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
|
||||
GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
|
||||
#
|
||||
# Optional: AirPcap developer's pack to capture wireless network traffic
|
||||
# incl. 802.11 management frames.
|
||||
#
|
||||
# If you have the AirPcap developer's pack, set this to the directory
|
||||
# in which the AirPcap developer's pack resides.
|
||||
#
|
||||
# If you don't have the AirPcap developer's pack, comment this line out,
|
||||
# so that AIRPCAP_DIR isn't defined.
|
||||
#
|
||||
#AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_1_0_0_594\AirPcap_Devpack
|
||||
|
||||
#
|
||||
# Optional: LIBSMI, System Management Interface
|
||||
#
|
||||
# Used for oid-name resolution for SNMP and other protocols
|
||||
#
|
||||
#SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
|
||||
|
||||
#
|
||||
# Optional: GeoIP, IP address database lookups
|
||||
#
|
||||
# Used to map IP addresses to MaxMind GeoIP database entries
|
||||
#
|
||||
# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0.
|
||||
# However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
|
||||
# these definitions. The SDK's SetEnv.bat script defines INETSDK.
|
||||
!IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
|
||||
#GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
|
||||
!ENDIF
|
||||
|
||||
!endif
|
||||
|
||||
##### Tools #####
|
||||
|
||||
# Set the following mandatory commands to find the tools.
|
||||
|
|
|
|||
|
|
@ -4,11 +4,16 @@
|
|||
|
||||
# This MUST be in the form
|
||||
# http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
|
||||
# or
|
||||
# http://anonsvn.wireshark.org/wireshark-win64-libs/tags/<date>/packages
|
||||
# in order to provide backward compatibility with older trees (e.g. a
|
||||
# previous release or an older SVN checkout).
|
||||
# Save previous tag.
|
||||
DOWNLOAD_TAG="2009-02-09"
|
||||
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/"
|
||||
DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-02-09"}
|
||||
PLATFORM=${PLATFORM:-"win32"}
|
||||
|
||||
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"
|
||||
|
||||
TAG_FILE="current_tag.txt"
|
||||
|
||||
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# $Id$
|
||||
|
||||
# 64-bit wrapper for win32-setup.sh.
|
||||
|
||||
export DOWNLOAD_TAG="2009-03-06"
|
||||
export PLATFORM="win64"
|
||||
|
||||
WIN32_SETUP=`echo $0 | sed -e s/win64/win32/`
|
||||
|
||||
exec $WIN32_SETUP $@
|
||||
Loading…
Reference in New Issue