osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM. 

svn path=/trunk/; revision=27701
This commit is contained in:
Gerald Combs 2009-03-11 16:13:17 +00:00
parent 7bff5bf554
commit 0d446ae826
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile.nmake
View File

@ -15,7 +15,7 @@ CC = cl
LINK= link
BSCMAKE= bscmake
WIN_SETUP=tools\$(PLATFORM)-setup.sh
WIN_SETUP=tools\$(WIRESHARK_TARGET_PLATFORM)-setup.sh
LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS)
@ -718,9 +718,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!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
glib gtk$(GTK_INST_VERSION)/glib_$(GLIB_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk$(GTK_INST_VERSION)/glib-dev_$(GLIB_PKG)_$(PLATFORM).zip
glib gtk$(GTK_INST_VERSION)/glib-dev_$(GLIB_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
!ELSE
!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
@ -728,7 +728,7 @@ process_libs:
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
!ENDIF
!IF "$(PLATFORM)" == "win32"
!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip
!ELSE
@ -790,19 +790,19 @@ process_libs:
!IFDEF GTK_DIR
!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
gtk2 gtk$(GTK_INST_VERSION)/gtk+_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/gtk+-dev_$(GTK_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/gtk+-dev_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/cairo_$(CAIRO_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/cairo_$(CAIRO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/cairo-dev_$(CAIRO_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/cairo-dev_$(CAIRO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/atk_$(ATK_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/atk_$(ATK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/atk-dev_$(ATK_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/atk-dev_$(ATK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/libpng_$(LIBPNG_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/libpng_$(LIBPNG_PKG)_$(WIRESHARK_TARGET_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)" \
@ -812,9 +812,9 @@ process_libs:
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.22"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/pango_$(PANGO_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/pango_$(PANGO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/pango-dev_$(PANGO_PKG)_$(PLATFORM).zip
gtk2 gtk$(GTK_INST_VERSION)/pango-dev_$(PANGO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
!ELSE
!ERROR ? Unknown or invalid PANGO_INST_VERSION
!ENDIF

14
config.nmake
View File

@ -6,8 +6,8 @@
##### Target platform #####
# Only "win32" and "win64" are valid (for now).
# This can be defined in the system environment.
!IFNDEF PLATFORM
PLATFORM=win32
!IFNDEF WIRESHARK_TARGET_PLATFORM
WIRESHARK_TARGET_PLATFORM=win32
!ENDIF
##### Versions #####
@ -35,7 +35,7 @@ WTAP_VERSION_MICRO=1
# Base directory, where your libraries reside, which are needed to
# compile the sources. This setting is used only inside this file.
#
WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs
WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
#
# Base directory, where your programs reside.
@ -55,14 +55,14 @@ TOOLS_DIR=tools
# TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64"
# (sorry ARM, Alpha, MIPS, and Itanium fans).
# CPU (Used by win32.mak) should be one of "i386" or "AMD64".
!if "$(PLATFORM)" == "win32"
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
TARGET_MACHINE=X86
CPU=i386
!else if "$(PLATFORM)" == "win64"
!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
TARGET_MACHINE=X64
CPU=AMD64
!else
!ERROR Your mysterious moon-man architecture "$(PLATFORM)" frightens and confuses us.
!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
!endif
@ -127,7 +127,7 @@ MSVC_VARIANT=MSVC2008
NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
!if "$(PLATFORM)" == "win32"
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
#
# Mandatory: GLib settings

4
tools/win32-setup.sh
View File

@ -10,9 +10,9 @@
# previous release or an older SVN checkout).
# Save previous tag.
DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-02-09"}
PLATFORM=${PLATFORM:-"win32"}
WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"}
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"
TAG_FILE="current_tag.txt"

2
tools/win64-setup.sh
View File

@ -5,7 +5,7 @@
# 64-bit wrapper for win32-setup.sh.
export DOWNLOAD_TAG="2009-03-06"
export PLATFORM="win64"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN32_SETUP=`echo $0 | sed -e s/win64/win32/`