diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-06-16 18:25:33 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-06-16 23:14:05 +0000 |
| commit | f113306e0ed0efc77eb9655c6196243af7fce6ce (patch) | |
| tree | a2eeb3d6e90ff1b9d00d60f78f17a8fc7e65645e /config.nmake | |
| parent | 048646d322a79ef0f4b609527bf5a5b5bfe7a199 (diff) | |
| download | wireshark-f113306e0ed0efc77eb9655c6196243af7fce6ce.tar.gz | |
More Python-bindings removal.
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/config.nmake b/config.nmake index 660139d4ab..04e2fd6792 100644 --- a/config.nmake +++ b/config.nmake @@ -195,30 +195,6 @@ MSVC_VARIANT=MSVC2010EE NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe # -# Optional: the Python library enables scripting support. -# -# If you don't have the Python library, comment this line out, so that -# PYTHON_EMBED isn't defined. -# -# NOTE: The Python library must have been compiled with the same -# compiler (MSVC_VARIANT) as Wireshark. Known python.org Python -# CRT versions: -# -# Python version CRT (32-bit) CRT (64-bit) -# 2.4.4 7.1 ? -# 2.6.1 9.0 ? -# 2.6.2 ? 9.0 -# 2.7.1 9.0 9.0 -# 3.2.2 9.0 9.0 -# -# If you versions of Python and Visual C++ use different CRTs -# comment this out. -# -# XXX The DLL path in epan/wspython/wspy_libws.py likely needs to -# be fixed before this is enabled by default. -#PYTHON_EMBED=1 - -# # Optional: the Python interpreter is used as part of the buildsystem # # This will override the automatic detection below. @@ -926,11 +902,6 @@ UPX=$(WIRESHARK_LIB_DIR)\upx303w\upx.exe ##### Flags, PATHs and Miscellaneous ##### -# Santity check: Python embedding requires a valid PYTHON_DIR -!IF DEFINED(PYTHON_EMBED) && !DEFINED(PYTHON_DIR) -!ERROR PYTHON_EMBED requires that PYTHON_DIR is defined -!ENDIF - # "convert" the MSVC variant into the required MSC compiler version !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" MSC_VER_REQUIRED=1400 @@ -1671,17 +1642,6 @@ LUA_LIBS= LUA_CONFIG= !ENDIF -!IF DEFINED(PYTHON_EMBED) -PYTHON_CFLAGS=/I$(PYTHON_DIR)\include -PYTHON_LIBS=$(PYTHON_DIR)\libs\python$(PYTHON_VER).lib -# Nmake uses carets to escape special characters -PYTHON_CONFIG=^#define HAVE_PYTHON 1 -!else -PYTHON_CFLAGS= -PYTHON_LIBS= -PYTHON_CONFIG= -!ENDIF - !IFDEF PORTAUDIO_DIR # Nmake uses carets to escape special characters PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1 |