- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)
svn path=/trunk/; revision=20258
I violated Murphy's nth law: thou shalt test fixes in an
'out of the box' configuration *not* in one's customized configuration.
:(
svn path=/trunk/; revision=20221
Note from a mail on gtk dev list:
-rwxr-xr-x 1 tml Administ 224510 Oct 3 18:35 libpango-1.0-0.dll
-rwxr-xr-x 1 tml Administ 37952 Oct 3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x 1 tml Administ 58749 Oct 3 18:35 libpangowin32-1.0-0.dll
(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)
svn path=/trunk/; revision=19880
Add portaudio v19 support in addition to v18:
Here is a patch using the API 2 (v19). I tested it only in Windows.
Attached also the Windows v19 zip file used. I did not modify the
Makefile.nmake to download this new version (when running the "setup"),
because Windows v18 it is still good.
svn path=/trunk/; revision=19446
fix bug 1096.
Switch back to fetching a date-stamped URL in win32-setup.sh. This
ensures backward compatibility with previous releases and non-updated
SVN trees.
svn path=/trunk/; revision=19339
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...
svn path=/trunk/; revision=19302
most changes are related to comments and the sequence of the settings, so by comparing the old and the new file, any merge conflicts will be hopefully easily resolved at least manually.
svn path=/trunk/; revision=19098
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to
compile it is necessary to:
+ For windows: uncomment the line
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
+ For linux: using the "--with-portaudio=yes"
svn path=/trunk/; revision=19094
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake. The code is currently limited to Windows, but should
be adaptable to other platforms.
The official announcement won't come until next week, so you'll have to
read the source for details. :)
svn path=/trunk/; revision=18928
libgcrypt, enable it in the Windows build.
In packet-ipsec.c:
- Remove non-constants from variable declaration initializations.
- Use ep_alloc() in a couple of places.
- Fix an off-by-one error.
- Reduce the number of SAs in the preferences from 4 to 2. 4 made the
preferences window absolutely enormous. This is probably the wrong
way to fix this.
- Fix up whitespace.
svn path=/trunk/; revision=18856
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().
Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().
That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().
Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.
svn path=/trunk/; revision=18201
components. Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting). This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.
svn path=/trunk/; revision=17302
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.
The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.
svn path=/trunk/; revision=17200
- 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.
svn path=/trunk/; revision=17196
Set up to build on Windows if we have GNU TLS.
Define "ssl_data_set()" regardless of whether we have GNU TLS or
not, as it's used in either case.
Get rid of an extra #include of epan/gnuc_format_check.h.
svn path=/trunk/; revision=17177
(as per mailing list discussions and mainly as the Gimp windows port also uses this version)
fix the NSIS install settings for GTK 2.6 of GTK-Wimp
svn path=/trunk/; revision=16820
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing. Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake. The rest of the occurrences of xcopy will have to
be taken care of at some point.
svn path=/trunk/; revision=15840
This way, the cygwin link.exe command will be behind the link.exe from MSVC.
Also added a definition of the docbook dir, floating around in my personal file for a while. This will be needed if the User's Guide is included in the NSIS installer later.
svn path=/trunk/; revision=15790
PATH contents one had before starting the build, that PATH is added to the new PATH variable 5 additional times
instead of 1.
I have made changes (supplied) to config.nmake that takes care of this
problem.
svn path=/trunk/; revision=15782
to fix compilation under Windows NT. This should fix bug 403.
The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'". They appear to work under XP, but if anything
broke I blame Larry Wall.
svn path=/trunk/; revision=15710
the timestamps now contain nseconds instead of microseconds and there's a new function added.
Is there a similar place for the Unix builds where this version has to be changed too?
svn path=/trunk/; revision=15551
version number.
WinPcap 3.1 is no longer in alpha. (Should we make WINPCAP_VERSION 3.1,
so we default to assuming WinPcap 3.1?)
svn path=/trunk/; revision=15438
filter after installing the filter.
Set HAVE_PCAP_LIB_VERSION if we're building with WinPcap 3.1; it's not
present in earlier versions, but is present in current 3.1 betas.
Check HAVE_PCAP_LIB_VERSION when building capture-wpcap.c.
svn path=/trunk/; revision=13872
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.
svn path=/trunk/; revision=12073
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
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
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
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
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
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
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
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
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
We do have to look for headers in $(GTK_DIR)\gdk when using the
development packages from the Ethereal Web site, as "gdkconfig.h" is in
that directory but it's included as <gdkconfig.h>.
The commented string for ADNS_CONFIG doesn't appear to get substituted
as we want it to be; just use an empty string for now.
svn path=/trunk/; revision=7892
GLIB_LIBS, and GTK_LIBS variables based on whether the GLib and GTK+
header files and libraries are in separate "glib" and "gtk+" directories
(as is the case for the developer's packages from the Ethereal Web site)
or in the same directory (as is the case for the developer's packages
from the GTK+-for-Win32 site).
svn path=/trunk/; revision=7890
variables the user configures - the user isn't expected to change
GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate libraries for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.
svn path=/trunk/; revision=7885
variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.
svn path=/trunk/; revision=7884
GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".
Note in "config.nmake" that:
if you have GNU ADNS, ADNS_DIR should be defined as the
directory in which the ADNS .lib file resides;
if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.
svn path=/trunk/; revision=7860
comma-separated, so that the resources will be built correctly and the
version number correctly displayed in the GUI, and make the resources
dependent on "config.nmake" so that they're rebuilt if it's changed.
svn path=/trunk/; revision=7373
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs
so that we can drop the MIB files there, instead of the default c:\usr\...
path.
Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust
CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly.
Define HAVE_UCD_SNMP in config.h.win32.
I tested this by creating c:\program files\ethereal\snmp\mibs and
dropping in the MIB files that come with Net-SNMP. Ethereal resolved
system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows. Under Linux
it resolved to "SNMPv2-MIB::sysDescr.0".
Ethereal.nsi still needs to be updated.
A compiled version of the Net-SNMP library can be found at
http://www.ethereal.com/distribution/win32/development/
svn path=/trunk/; revision=6385
releases don't involve explosive bolts like NASA launches do.
Bring the ChangeLog and NEWS files up to date to the end of August.
svn path=/trunk/; revision=6341
Additional Windows Makefile dependencies, so more stuff gets
built as needed.
Additional stuff cleaned up by "make clean" (well, "nmake -f
makefile.nmake clean", anyway)
Make PDB_FILE be "vc*.pdb", so it referes to the PDB files
either for VC++ 5.0 or VC++ 6.0.
svn path=/trunk/; revision=4481
Add some missing files in the "clean" targets.
Use pod2html rather than man2html to build HTML man pages.
Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo.
svn path=/trunk/; revision=4475
they're not built and the executables already contain debugging
information, and update the README.win32 file appropriately and add
Text2Pcap and Mergecap to it.
svn path=/trunk/; revision=4425
fix a bogus batch mode inference rule of make, so that
"vc60.pdb" files are created in the proper directory;
delete ".pdb" files in a "nmake -f Makefile.nmake clean";
include the text2pcap and mergecap ".pdb" files in the Windows
binary distribution.
svn path=/trunk/; revision=4385
Update NSIS syntax for newest NSIS. That fix from David O'Shea.
Set config.nmake to get non-cygwin version of Python.exe; cygwin version
is fouling up on me and I'm not sure why.
svn path=/trunk/; revision=3705
Pre-compiled zlib provided at
http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip
"fixed" because the pre-compiled version in the "extralibs" package
from the Gimp/Win32 page has a fault zlib.lib in it.
Add note about zlib in README.win32; more work needs to be done to
this file to mention new packaging method.
svn path=/trunk/; revision=3263
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.
svn path=/trunk/; revision=3258
perl and man2html. Don't call this makefile from the parent makefile
as not everyone will want to create documentation.
Add a couple variables to config.nmake to support this.
svn path=/trunk/; revision=3119
a framework for the dissector; of the more than 400 NCP packet types, only
a handful are defined. But this dissector framework is much better than
the previous one.
svn path=/trunk/; revision=2173
build "register.c" in the top-level Makefile;
set path in "config.nmake" to include the Cygwin directory for
tools - those tools are needed to build "register.c";
remove constructed source files, and some additional object
files, when doing "nmake clean".
svn path=/trunk/; revision=1896
have top-level Makefile.nmake call Makefile.nmake's in subdirectories.
Build plugins, and build generated source (lex, yacc). The only thing we
can't build is register.c; I need to re-work the top-level Makefile.nmake
because it lists object files, not C files, which make-reg-dotc needs.
svn path=/trunk/; revision=1608
Ulf Lamping