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

Make Python mandatory to build on Windows 

While nominally optional, building without it doesn't work, so just make it
mandatory.

The verify_tools target already passes $(PYTHON) to win-setup.sh --appverify;
we just need to supply a default value for PYTHON, so that $(PYTHON) doesn't
expand to an empty string. It's also convenient for the developer if Python
can be automatically found on the PATH.

Change-Id: I4f54695625b74c5b4c758ef1e3bc9ed4467db514
Reviewed-on: https://code.wireshark.org/review/3391
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Tested-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Роман Донченко 2014-08-03 03:21:31 +04:00 committed by Anders Broman
parent 4da7570809
commit b8a6cfcb2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.nmake
View File

@ -190,7 +190,7 @@ MSVC_VARIANT=MSVC2010EE
NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
#
# Optional: the Python interpreter is used as part of the buildsystem
# The Python interpreter is used as part of the buildsystem
#
# This will override the automatic detection below.
#PYTHON_VER=27
@ -229,6 +229,11 @@ PYTHON="$(PYTHON_DIR)\python.exe"
PATH=$(PYTHON_DIR);$(PATH)
!ENDIF
# If all else fails, try to find it on the PATH
!IF !DEFINED(PYTHON)
PYTHON=python
!ENDIF
#### Save files as pcap-ng by default. Comment out to use pcap instead. ####
PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1