Commit graph

98 commits

Author SHA1 Message Date
Guy Harris
f28323ba39 From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
2004-07-23 06:11:50 +00:00
Guy Harris
8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Gerald Combs
df8f6cdb5e Use libethereal.dll by default.
svn path=/trunk/; revision=11374
2004-07-13 18:19:59 +00:00
Gerald Combs
a3545d4b9f Enable GTK_WIMP and GTK2 by default. Make GTK2 2.4 and Pango 1.4 the default
versions.

svn path=/trunk/; revision=11335
2004-07-07 19:15:46 +00:00
Gerald Combs
44f812de8e Prep for the 0.10.5 release.
svn path=/trunk/; revision=11319
2004-07-06 16:29:18 +00:00
Ulf Lamping
4ee816d884 add GTK2.4 and alike libs to the setup target,
depending on settings in config.nmake

svn path=/trunk/; revision=11201
2004-06-20 20:28:23 +00:00
Ulf Lamping
17a6cec78f update DOXYGEN setting and add new HHC (MS html help compiler) setting
svn path=/trunk/; revision=11108
2004-06-04 17:31:11 +00:00
Anders Broman
ea7b5edf35 Revert previous checkin made by mistake *sigh
svn path=/trunk/; revision=11061
2004-06-01 21:45:40 +00:00
Anders Broman
cf28fb1538 From Thomas Anders dissects the RTP Payload Type (if media protocol is RTP/AVP)
with its descriptive name rather than the raw value string,
much like packet-rtp.c does already.
To avoid duplicate definitions,  the existing rtp_payload_type_vals[] definition is  moved
from packet-rtp.c and gtk/rtp_stream_dlg.c to rtp_pt.h.

svn path=/trunk/; revision=11060
2004-06-01 21:40:41 +00:00
Guy Harris
01c249fd4f From Lars Roland: define an "installation" version of GTK+ 2.x and Pango
in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories.  Also, when uninstalling, remove both of the sets of
subdirectories.

As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.

svn path=/trunk/; revision=10976
2004-05-23 22:21:30 +00:00
Gerald Combs
fa3bc245fd Bump the version up to 0.10.4. Preliminary updates to the NEWS file. Updates
welcome.

svn path=/trunk/; revision=10863
2004-05-13 03:34:14 +00:00
Ulf Lamping
904982df8e add "configurable" path to doxygen.exe
svn path=/trunk/; revision=10845
2004-05-11 01:05:13 +00:00
Guy Harris
15af0f656f 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
2004-05-09 10:03:41 +00:00
Gerald Combs
a011fb14e2 Add a Makefile.nmake target called "setup" that uses the script
tools\win32-setup.sh to

  - Check for applications required to build Ethereal
  - Download and unpack required packages into $ETHEREAL_LIBS

Update ADNS to the latest version.

Make Python 2.3 the default.

svn path=/trunk/; revision=10567
2004-04-08 20:36:09 +00:00
Gerald Combs
4c0ecdcd9b Bump the version up to 0.10.3.
svn path=/trunk/; revision=10436
2004-03-22 17:03:30 +00:00
Ulf Lamping
301b5ddbcc added gtk-wimp to the nsis installer build
svn path=/trunk/; revision=10227
2004-02-24 18:51:40 +00:00
Gerald Combs
d389b5207e Bump the version to 0.10.2
svn path=/trunk/; revision=10205
2004-02-23 21:53:05 +00:00
Gerald Combs
0fca486734 Bump the version to 0.10.1.
svn path=/trunk/; revision=10100
2004-02-19 00:28:15 +00:00
Ulf Lamping
132c807e39 making the Modern UI the default
svn path=/trunk/; revision=10022
2004-02-10 18:12:40 +00:00
Guy Harris
a4464a6788 Raise the Wiretap version number to 0.1, as the current version isn't
binary-compatible with earlier versions.  (That should have been done
for all binary-incompatible changes, and should be done for
binary-incompatible changes in the future.)

svn path=/trunk/; revision=9916
2004-01-31 03:35:25 +00:00
Ulf Lamping
064d5e5e07 Added the ability to compile both GTK versions 1 and 2 at the same time.
svn path=/trunk/; revision=9827
2004-01-24 20:01:36 +00:00
Gerald Combs
e98fb47e76 Update to GLib 2.2.3-20040116 and gettext 0.13.1.
svn path=/trunk/; revision=9799
2004-01-23 02:38:03 +00:00
Ulf Lamping
87fc510cb5 switched to MSVC warning level 3 and
default is winpcap version 3 now

svn path=/trunk/; revision=9562
2004-01-05 21:04:42 +00:00
Ulf Lamping
391cfa861d From Lars Roland: corrected PATH settings
svn path=/trunk/; revision=9554
2004-01-05 15:05:00 +00:00
Ulf Lamping
35e5ba4edd all libs now relative to a base dir, use compiler warning level 2
svn path=/trunk/; revision=9461
2003-12-28 18:31:14 +00:00
Ulf Lamping
cce063356e added/changed some comments
svn path=/trunk/; revision=9456
2003-12-27 13:19:06 +00:00
Ulf Lamping
b6092e26fd conditionally use modern UI for NSIS installer
svn path=/trunk/; revision=9447
2003-12-26 11:37:58 +00:00
Ulf Lamping
16cb58be9a removed COMMON_FILES_GNU from path,
use the directories xy_DIR from the settings above

svn path=/trunk/; revision=9430
2003-12-23 11:57:26 +00:00
Ulf Lamping
f86e376f5b get rid of the COMMON_FILES_GNU setting,
by getting the DLL's from the "source tree"

svn path=/trunk/; revision=9415
2003-12-22 21:41:40 +00:00
Ulf Lamping
9499f200a6 calling pod2man and pod2html indirectly through the bash
svn path=/trunk/; revision=9414
2003-12-22 21:34:13 +00:00
Gerald Combs
9fd657a0e1 Bump the version to 0.10.0. It could be (and has been) argued that the
last release should have been 0.10.0.

svn path=/trunk/; revision=9235
2003-12-10 21:50:04 +00:00
Gerald Combs
409948eced Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
2003-12-07 00:04:32 +00:00
Gerald Combs
c219943fc1 Switch over to Net-SNMP 5.1. A ZIP file of the Net-SNMP 5.1 sources plus
a static Windows library (netsnmp.lib) has been placed at

    http://www.ethereal.com/distribution/win32/development/

The Net-SNMP documentation recommends against using a DLL at the
present time.

svn path=/trunk/; revision=9177
2003-12-05 16:00:34 +00:00
Gerald Combs
7569aef3df Switch to the new (and official) zlib DLL from www.gzip.org.
svn path=/trunk/; revision=9127
2003-12-01 17:17:51 +00:00
Ulf Lamping
c4df7b705a added gdk_pixbuf to GTK2 specific libs to link (needed in toolbar.c)
svn path=/trunk/; revision=8972
2003-11-15 11:39:57 +00:00
Guy Harris
73fdd454b6 Get rid of GLib 1.3 support - current versions of GTK+ 1.3 require GLib
2.0, and earlier versions are sufficiently buggy that we don't want to
support them.

svn path=/trunk/; revision=8939
2003-11-11 18:25:04 +00:00
Guy Harris
4192ad9770 Let people configure whether to build with Zlib or not solely by
controlling whether ZLIB_DIR is defined or not in config.nmake.

svn path=/trunk/; revision=8911
2003-11-07 23:27:13 +00:00
Gerald Combs
cb452773c2 Bump the version number to 0.9.16.
svn path=/trunk/; revision=8861
2003-11-02 23:36:01 +00:00
Guy Harris
bd2ea47524 Configure whether we have WinPcap based on whether WINPCAP_VERSION is
set in the config.nmake file.

Configure whether we have pcap_findalldevs() based on whether
WINPCAP_VERSION is 2.3 (if so, we don't) or 3.0 or 3.1 (if so, we do).

WinPcap 3.0 has the new libpcap declarations of "pcap_lookupnet()" and
"pcap_open_live()" in which the first argument is a "const char *"
rather than a "char *"; declare the functions and pointers to them
appropriately based on the version of WinPcap.

If we don't have pcap_findalldevs(), don't declare a pointer to it, as
we don't have a declaration of pcap_if_t.

We also need to refer to "pcap_freealldevs()", so make a pointer for it.

"symbols[]" is a const array; make the pointer to elements in it a const
pointer.

Fix some typoes.

svn path=/trunk/; revision=8660
2003-10-10 09:48:54 +00:00
Gerald Combs
f87f524260 Bump the version to 0.9.15. Update the NEWS and ChangeLog to August 27. More
updates to come.

svn path=/trunk/; revision=8410
2003-09-08 03:13:15 +00:00
Gerald Combs
3303295c84 Add default development package locations to README.win32. Use zlib 1.1.4
by default in config.nmake.

svn path=/trunk/; revision=8246
2003-08-24 23:25:40 +00:00
Guy Harris
6f4508de8c Define GCC_GLIB_CFLAGS as a GCC equivalent of GLIB_CFLAGS, and use it
instead of -I$(GLIB_DIR) when running GCC to generate the xyzzy file, so
that the right -I flags are used.

svn path=/trunk/; revision=8190
2003-08-19 02:16:26 +00:00
Gerald Combs
ddd408ad2f Build with Glib 2.0 and GTK+ 1.3 by default. Don't build with zlib 1.13.
Add minor updates to README.win32.

svn path=/trunk/; revision=8126
2003-08-04 14:34:17 +00:00
Guy Harris
0f9b1a0458 From Lars Roland: add support for GTK+ 1.3 with GLib 2.0 (the latest
GTK+ 1.3[.x]-for-Win32, which fixes several GTK+ problems, requires GLib
2.0, not GLib 1.3).

svn path=/trunk/; revision=8125
2003-08-04 08:10:33 +00:00
Gerald Combs
c6e91e0aa6 Prep for the 0.9.14 release
svn path=/trunk/; revision=8068
2003-07-23 02:06:25 +00:00
Guy Harris
a9af7329b8 Well, you need more than just an escaped # to handle the undef, so go
back to defining it as nothing.

svn path=/trunk/; revision=7939
2003-06-26 08:41:33 +00:00
Guy Harris
f808651b9e OK, try bringing back the #undef, now that we know how to escape the #.
svn path=/trunk/; revision=7927
2003-06-25 06:49:59 +00:00
Gerald Combs
ad59ab2353 Properly escape the '#' character in the HAVE_GNU_ADNS definition.
svn path=/trunk/; revision=7924
2003-06-24 18:51:21 +00:00
Guy Harris
2e0b314579 Handle the 1.3 vs. 2.x issue similarly to the way Lars Roland's patches
did, basing the path name structure on the version number, but handle
GLib and GTK+ orthogonally.

svn path=/trunk/; revision=7896
2003-06-17 05:38:24 +00:00
Guy Harris
b65f1a77c1 From Lars Roland:
fix typo in my earlier checkin - GTK_GLIB_DIR should be
	GLIB_GTK_DIR;

	look for headers in "lib\glib-$(GLIB_VERSION)\include and
	"lib\gtk-$(GTK_VERSION)\include, as that's where the 2.x
	packages hide "glibconfig.h" and "gdkconfig.h".

svn path=/trunk/; revision=7894
2003-06-17 04:21:59 +00:00