diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
| commit | 15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch) | |
| tree | 96fab6287a112ff9379ebf012a7a939884b62ec1 /packaging/nsis | |
| parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
libethereal.dll or not;
remove "./wiretap" from PATH to prevent problems due to
wrongly-loaded files;
build dissector.lib with MSVC;
move "print.c" and "ps.c" to the dissector helpers, as "print.c"
imports variables from packet-frame.c and packet-data.c, which
are in libethereal;
move "g711.c" out of the dissector helpers, as they're used only
by Ethereal in a tap, not in Tethereal or in any dissector;
add a .def file for libethereal;
arrange to declare global variables exported from libethereal
with "__declspec(dllimport)" when building programs that import
those variables;
update the NSIS installer.
Make the "configure" script define ETH_VAR_IMPORT as "extern".
svn path=/trunk/; revision=10834
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 28b74492f8..7408c45f7b 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.39 2004/03/25 11:21:06 guy Exp $ +# $Id: Makefile.nmake,v 1.40 2004/05/09 10:03:41 guy Exp $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -89,6 +89,9 @@ $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake !IF "$(MAKENSIS_MODERN_UI)" != "" /DMAKENSIS_MODERN_UI=$(MAKENSIS_MODERN_UI) \ !ENDIF +!IF "$(ENABLE_LIBETHEREAL)" != "" + /DENABLE_LIBETHEREAL=$(ENABLE_LIBETHEREAL) \ +!ENDIF !IFDEF GTK1_DIR /DGTK1_DIR=$(GTK1_DIR) \ !ENDIF diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 2a89ea0a77..003feaf98e 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.52 2004/03/25 11:21:06 guy Exp $ +; $Id: ethereal.nsi,v 1.53 2004/05/09 10:03:41 guy Exp $ !ifdef MAKENSIS_MODERN_UI @@ -136,6 +136,9 @@ SetShellVarContext all SetOutPath $INSTDIR File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll" +!ifdef ENABLE_LIBETHEREAL +File "..\..\epan\libethereal.dll" +!endif File "${GLIB_DIR}\bin\libglib-2.0-0.dll" File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll" File "${GLIB_DIR}\bin\libgobject-2.0-0.dll" |