diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-27 00:45:55 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-27 00:45:55 +0000 |
| commit | 354983d30d5f22189dd134c43a71e2a6d9a55231 (patch) | |
| tree | 5b8afd6522a11e3a517f89232bb35a7cc907238e /Makefile.nmake | |
| parent | f9915b8150486701058c362c5d65d13c7d7392cb (diff) | |
use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
svn path=/trunk/; revision=19331
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2bf93073bd..2faa45f46f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -550,7 +550,7 @@ setup: verify_tools !ENDIF !IFDEF LUA_DIR @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - . lua5_1_1_vc6.zip + . lua5_1_dll.zip !ENDIF !IFDEF GNUTLS_DIR @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ @@ -646,7 +646,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/gtk-wimp rm -r -f $(WIRESHARK_LIBS)/kfw-2.5 rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32 - rm -r -f $(WIRESHARK_LIBS)/lua511 + rm -r -f $(WIRESHARK_LIBS)/lua5.1 rm -r -f $(WIRESHARK_LIBS)/net-snmp-5.3.1 rm -r -f $(WIRESHARK_LIBS)/pcre-6.4 rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1 @@ -854,6 +854,9 @@ install-common-deps: if not exist $(INSTALL_DIR)\mibs mkdir $(INSTALL_DIR)\mibs xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\mibs /d !ENDIF +!IFDEF LUA_DIR + xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d +!ENDIF clean-deps1: rm -f $(INSTALL1_DIR)\*.dll |