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

1 files changed, 27 insertions, 6 deletions

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index b0e2d43ed7..77f5fa026e 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -28,6 +28,14 @@ WSLUA_LIB=
 WSLUA_DIR=
 !ENDIf
 
+!IFDEF PYTHON_DIR
+WSPYTHON_LIB=wspython\wspython.lib
+WSPYTHON_DIR=wspython
+!ELSE
+WSPYTHON_LIB=
+WSPYTHON_DIR=
+!ENDIf
+
 # For use when making libwireshark.dll
 libwireshark_LIBS = \
 	$(GLIB_LIBS)	\
@@ -39,6 +47,7 @@ libwireshark_LIBS = \
 	$(ZLIB_LIBS) \
 	$(GNUTLS_LIBS) \
 	$(LUA_LIBS) \
+	$(PYTHON_LIBS) \
 	$(SMI_LIBS) \
 	$(GEOIP_LIBS) \
 	..\wsutil\libwsutil.lib \
@@ -48,6 +57,7 @@ libwireshark_LIBS = \
 	ftypes\ftypes.lib \
 	dfilter\dfilter.lib \
 	$(WSLUA_LIB) \
+	$(WSPYTHON_LIB) \
 	dissectors\dissectors.lib
 
 .c.obj::
@@ -67,17 +77,17 @@ DOXYGEN_DEP=doxygen
 !ENDIF
 
 !IFDEF ENABLE_LIBWIRESHARK
-all: crc crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.dll
+all: crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors libwireshark.dll
 !ELSE
-all: crc crypt ftypes dfilter $(WSLUA_DIR) dissectors libwireshark.lib
+all: crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors libwireshark.lib
 !ENDIF
 
 # For use when making libwireshark.dll
 libwireshark.lib: libwireshark.dll
 libwireshark.exp: libwireshark.dll
 
-libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
-                 crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res
+libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
+                 crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res
 	@echo Linking libwireshark.dll
 	$(link) $(dlllflags) $(conlibsdll) shell32.lib \
 		$(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \
@@ -87,8 +97,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt
 		dissectors\register.obj \
 		$(EXTRA_OBJECTS)
 
-libwireshark.lib	: ..\config.h $(LIBWIRESHARK_OBJECTS) crc crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
-                  crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib
+libwireshark.lib	: ..\config.h $(LIBWIRESHARK_OBJECTS) crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
+                  crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) $(WSPYTHON_LIB) dissectors\dissectors.lib
 	link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \
 		$(EXTRA_OBJECTS)
 
@@ -117,6 +127,8 @@ clean:  clean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../wslua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../wspython
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
 
 #
@@ -149,6 +161,8 @@ distclean: distclean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../wslua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../wspython
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ..
 
 maintainer-clean-local: distclean-local
@@ -166,6 +180,8 @@ maintainer-clean: maintainer-clean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../wslua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ../wspython
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ..
 
 crc:: ..\config.h
@@ -198,6 +214,11 @@ wslua:: ..\config.h
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
+wspython:: ..\config.h
+	cd wspython
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd ..
+
 doxygen.cfg: ..\config.nmake doxygen.cfg.in
 	sed -e s/@VERSION@/$(VERSION)/ \
 	    < doxygen.cfg.in > $@