diff options
| author | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-07 09:12:43 +0000 |
|---|---|---|
| committer | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-07 09:12:43 +0000 |
| commit | 9213b3b231c28d04eb2559577dad7e504b4e26a5 (patch) | |
| tree | 59919707a0240a17f3c27533f162ae0ffa6d1fff /packaging | |
| parent | f9badc2f661b758c3d9a90ee74a1fdb88c77114b (diff) | |
changes to build lua plugin with MSVC6:
- nmake makefile for lua plugin added.
- declare variables at the beginning of a function.
- proto_reg_handoff_lua was removed, remove remaining calls, too.
- missing functions to libethereal.def added.
add lua plugin to installer, if available.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17196 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index a400e75f80..355bd2ef15 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -76,6 +76,9 @@ PLUGINS=../../plugins/acn/acn.dll \ ../../plugins/gryphon/gryphon.dll \ ../../plugins/h223/h223.dll \ ../../plugins/irda/irda.dll \ +!IFDEF LUA_DIR + ../../plugins/lua/lua.dll \ +!ENDIF ../../plugins/lwres/lwres.dll \ ../../plugins/mate/mate.dll \ ../../plugins/megaco/megaco.dll \ @@ -144,6 +147,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake !IF "$(ZLIB_DIR)" != "" /DZLIB_DIR=$(ZLIB_DIR) \ !ENDIF +!IFDEF LUA_DIR + /DLUA_DIR=$(LUA_DIR) \ +!ENDIF ethereal.nsi clean: diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 2d9d82db53..cf3717df30 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -719,6 +719,14 @@ SetOutPath $INSTDIR\plugins\${VERSION} File "..\..\plugins\mate\mate.dll" SectionEnd +!ifdef LUA_DIR +Section "LUA Plugin" SecLua +;------------------------------------------- +SetOutPath $INSTDIR\plugins\${VERSION} +File "..\..\plugins\lua\lua.dll" +SectionEnd +!endif + Section "SNMP MIBs" SecMIBs ;------------------------------------------- !ifdef GTK1_DIR & GTK2_DIR @@ -984,6 +992,9 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections." !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics." !insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)." +!ifdef LUA_DIR + !insertmacro MUI_DESCRIPTION_TEXT ${SecLua} "Plugin - LUA (Experimental)." +!endif !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools." !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file." |