aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-03-01 21:31:07 +0000
committerGerald Combs <gerald@wireshark.org>2006-03-01 21:31:07 +0000
commit050525cfb532ad640dc8bc2b9cbd6815bb7b7e60 (patch)
treecfb49e2e8705730b9a1b04065d134865f62543d1 /config.nmake
parent873321aa302a028792dd8a396143624269d1c445 (diff)
Add Lua support by default for Win32. Fix some compilation problems.
Add Lua information to the version paragraph. svn path=/trunk/; revision=17440
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake4
1 files changed, 2 insertions, 2 deletions
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