diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-03-01 21:31:07 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-03-01 21:31:07 +0000 |
| commit | 050525cfb532ad640dc8bc2b9cbd6815bb7b7e60 (patch) | |
| tree | cfb49e2e8705730b9a1b04065d134865f62543d1 /Makefile.nmake | |
| parent | 873321aa302a028792dd8a396143624269d1c445 (diff) | |
| download | wireshark-050525cfb532ad640dc8bc2b9cbd6815bb7b7e60.tar.gz | |
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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 8 insertions, 2 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)" \ |