diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-06-01 22:20:15 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-06-01 22:20:15 +0000 |
| commit | fe79af8f421f738dcb767b4fdadad8bf65c81400 (patch) | |
| tree | e9d095d8acc923c5458ff7870a7e148134762a6f /Makefile.nmake | |
| parent | 217b344bd982ce69a688805ee9f5d27aa9c9ecbd (diff) | |
From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.
[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529
From me:
Comment out PYTHON_EMBED for now.
Start a list of known Python+CRT versions.
Add get_wspython_dir to libwireshark.def.
svn path=/trunk/; revision=33036
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 75298aa5d7..b8335c8c36 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -43,7 +43,7 @@ GENERATED_CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ $(AIRPCAP_CFLAGS) \ $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) \ - $(LUA_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \ + $(LUA_CFLAGS) $(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \ -D_U_="" -D_NEED_VAR_IMPORT_ CFLAGS=-WX $(GENERATED_CFLAGS) @@ -77,6 +77,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(HHC_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ + $(PYTHON_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -96,6 +97,7 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ + $(PYTHON_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -115,6 +117,7 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ + $(PYTHON_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -155,7 +158,8 @@ dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) \ $(GTHREAD_LIBS) \ - $(GNUTLS_LIBS) + $(GNUTLS_LIBS) \ + $(PYTHON_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ @@ -369,6 +373,7 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \ -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \ + -e "s/@HAVE_PYTHON@/$(PYTHON_CONFIG)/" \ -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \ -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \ -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \ @@ -944,6 +949,12 @@ install-generated-files: xcopy ".\epan\wslua\init.lua" $(INSTALL_DIR) /d xcopy ".\epan\wslua\console.lua" $(INSTALL_DIR) /d !ENDIF +!IFDEF PYTHON_DIR + if not exist $(INSTALL_DIR)\python mkdir $(INSTALL_DIR)\python + xcopy ".\epan\wspython\register-dissector.py" $(INSTALL_DIR)\python /d + xcopy ".\epan\wspython\wspy_dissector.py" $(INSTALL_DIR)\python /d + xcopy ".\epan\wspython\wspy_libws.py" $(INSTALL_DIR)\python /d +!ENDIF xcopy ipmap.html $(INSTALL_DIR) /d xcopy doc\*.html $(INSTALL_DIR) /d if not exist $(INSTALL_DIR)\help mkdir $(INSTALL_DIR)\help |