diff options
| -rw-r--r-- | Makefile.nmake | 10 | ||||
| -rw-r--r-- | config.h.win32 | 5 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | plugins/lua/Makefile.nmake | 34 | ||||
| -rw-r--r-- | plugins/lua/elua_tree.c | 2 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rw-r--r-- | version_info.c | 13 |
7 files changed, 48 insertions, 22 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b7d5dd071e..edef736e01 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -16,7 +16,8 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ - $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_ + $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) \ + -D_U_="" -D_NEED_VAR_IMPORT_ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -227,7 +228,8 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \ -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \ -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ - -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \ + -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \ + -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ < config.h.win32 > $@ ps.c : rdps.exe print.ps @@ -508,6 +510,10 @@ setup: verify_tools @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ zlib123-dll zlib123-dll.zip !ENDIF +!IFDEF LUA_DIR + @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ + . lua5_1b1_vc6.zip +!ENDIF !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.8" @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \ diff --git a/config.h.win32 b/config.h.win32 index 173466bc70..dcd9094f40 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -193,9 +193,12 @@ /* Define to use the Nettle library */ @HAVE_NETTLE@ -/* Define to use the gnutls library*/ +/* Define to use the gnutls library */ @HAVE_GNUTLS@ +/* Define to use Lua */ +@HAVE_LUA@ + #ifndef WIN32 #define WIN32 1 #endif diff --git a/config.nmake b/config.nmake index 6b574215f2..12f6a5b9bc 100644 --- a/config.nmake +++ b/config.nmake @@ -168,7 +168,7 @@ PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.4 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -# LUA_DIR=$(ETHEREAL_LIBS)\lua-5.0.2 +LUA_DIR=$(ETHEREAL_LIBS)\lua5_1b1_vc6 # # Set ICONV_DIR to the pathname of the directory in which the @@ -435,7 +435,7 @@ GNUTLS_CONFIG= !IFDEF LUA_DIR LUA_CFLAGS=/I$(LUA_DIR)\include -LUA_LIBS=$(LUA_DIR)\bin\LibLua.lib $(LUA_DIR)\bin\LibLuaLib.lib +LUA_LIBS=$(LUA_DIR)\lib\vc6\lua51.lib # Nmake uses carets to escape special characters LUA_CONFIG=^#define HAVE_LUA 1 !else diff --git a/plugins/lua/Makefile.nmake b/plugins/lua/Makefile.nmake index 1e9f84b9a2..fe5712e7f8 100644 --- a/plugins/lua/Makefile.nmake +++ b/plugins/lua/Makefile.nmake @@ -17,37 +17,41 @@ LINK_PLUGIN_WITH=..\..\epan\libethereal.lib CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) MODULES= \ - elua_tvb.c \ - elua_proto.c \ - elua_tree.c \ + elua_dumper.c \ + elua_gui.c \ elua_pinfo.c \ + elua_proto.c \ elua_tap.c \ - elua_gui.c \ - elua_dumper.c - + elua_tree.c \ + elua_tvb.c \ + elua_util.c + OBJECTS= \ - elua_tvb.obj \ - elua_proto.obj \ - elua_tree.obj \ + elua.obj \ + elua_dumper.obj \ + elua_gui.obj \ elua_pinfo.obj \ + elua_plugin.obj \ + elua_proto.obj \ elua_tap.obj \ - elua_gui.obj \ - elua_dumper.obj \ - elua.obj \ - elua_plugin.obj + elua_tree.obj \ + elua_tvb.obj \ + elua_util.obj lua.dll lua.exp lua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:lua.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(LUA_LIBS) + $(GLIB_LIBS) $(LUA_LIBS) ..\..\wiretap\wiretap-$(WTAP_VERSION).lib elua_register.h: elua_makereg.pl $(MODULES) $(PERL) elua_makereg.pl $(MODULES) > elua_register.h +$(OBJECTS): elua_register.h + doc: $(MODULES) $(PERL) elua_makedoc.pl $(MODULES) -elua.c: LuaLib.lib +#elua.c: $(LUA_LIBS) !ENDIF !ENDIF diff --git a/plugins/lua/elua_tree.c b/plugins/lua/elua_tree.c index 08bdb3c32d..37aaf45562 100644 --- a/plugins/lua/elua_tree.c +++ b/plugins/lua/elua_tree.c @@ -289,7 +289,7 @@ static int ProtoItem_add_subtree(lua_State *L) { ProtoItem item = checkProtoItem(L,1); if (item) { - SubTree* ett;; + SubTree* ett; ProtoTree tree; if (isSubTree(L,2)) { diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 3fe7d1be00..05bb262e0c 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -1,7 +1,7 @@ #!/bin/sh # DOWNLOAD_PREFIX="http://www.ethereal.com/distribution/win32/development" -DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-12-21/packages" +DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2006-03-01/packages" err_exit () { echo "" diff --git a/version_info.c b/version_info.c index e6a15d939d..b9cfde4552 100644 --- a/version_info.c +++ b/version_info.c @@ -65,6 +65,9 @@ #include <windows.h> #endif +#ifdef HAVE_LUA +#include <lua.h> +#endif #ifdef SVNVERSION const char *svnversion = " (" SVNVERSION ")"; @@ -193,6 +196,16 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without ADNS"); #endif /* HAVE_GNU_ADNS */ + g_string_append(str, ","); + + g_string_append(str, " "); + break_point = str->len - 1; +#ifdef HAVE_LUA + g_string_append(str, "with "); + g_string_append(str, LUA_VERSION); +#else + g_string_append(str, "without Lua"); +#endif /* HAVE_LUA */ g_string_append(str, "."); do_word_wrap(str, break_point); |