Commit Graph

153 Commits

Author SHA1 Message Date
Bill Meier 0303dfbf9f Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
2010-04-22 19:35:47 +00:00
Guy Harris ceb816e721 Put the object file lists for various test programs into variables, and
use the variables, so the list of dependencies and the list of object
files used in the link command are the same (and so that they're
complete; the dependencies were, the link command lists weren't).

svn path=/trunk/; revision=32067
2010-03-01 19:17:05 +00:00
Guy Harris 47ec37c44e tvbtest needs bytes_to_str() and bytes_to_str_punct(), and they're now
in to_str.c.

svn path=/trunk/; revision=32040
2010-02-27 22:42:01 +00:00
Kovarththanan Rajaratnam 70590c7613 Add new to_str.o/obj dependency to reassemble_test target
svn path=/trunk/; revision=31976
2010-02-24 08:13:58 +00:00
Kovarththanan Rajaratnam e6486705f7 Move make-sminmpec.pl to tools directory
svn path=/trunk/; revision=30511
2009-10-11 14:39:14 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs bfa7074d82 mkstemp cleanups.
svn path=/trunk/; revision=28923
2009-07-02 19:50:35 +00:00
Gerald Combs e2cd2bf4f2 Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_file
if we're not using any encryption libraries on Windows.

This fixes the last Win64 compilation problems in epan.

svn path=/trunk/; revision=28008
2009-04-08 19:15:10 +00:00
Gerald Combs c86c61602a Add another Flex exception.
svn path=/trunk/; revision=28003
2009-04-08 18:10:32 +00:00
Gerald Combs 15f33eecbf Disable warnings-as-errors for Flex-generated output. Add a couple of gsize
casts.

svn path=/trunk/; revision=28002
2009-04-08 18:08:25 +00:00
Gerald Combs dd903ca9c8 Create an "epan/crc" directory for CRC code. Add crc-16-plain.[ch],
generated from pycrc. The command line used to generate the file is in
epan/crc/Makefile.common. I used "plain" to distinguish it from CCITT,
USB, and other 16-bit CRCs. Integrate the new CRC code into our
infrastructure.

Add crc16_plain_tvb_offset() to epan/crc16.[ch] and use it in
plugins/profinet/packet-pn-rt.c. This _should_ work correctly, but
hasn't been tested.

svn path=/trunk/; revision=27790
2009-03-18 21:59:30 +00:00
Gerald Combs 57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
Gerald Combs c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs 85fb7e2305 _MSC_VERs 1400 and greater require manifests. Check against
MSC_VER_REQUIRED when we run mt.exe instead of checking for each
individual MSVC_VARIANT. This fixes the current buildbot test failures
on Windows, which resulted from a missing check for MSVC2008. This
also keeps us from having to mess with a bunch of makefiles when we add
support for new Visual C++ versions.

svn path=/trunk/; revision=26052
2008-08-21 18:12:47 +00:00
Gerald Combs 021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Guy Harris a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Guy Harris b6e20d89be Put printf into a separate "termoutput" API group. For most files,
check for it - but not for TShark plugins, as they are expected to
print to the standard output.

svn path=/trunk/; revision=25653
2008-07-01 21:13:32 +00:00
Bill Meier f572cd1a85 Set for automatic overwrite for xcopy of mkstemp.c, etc
svn path=/trunk/; revision=25356
2008-05-23 00:25:20 +00:00
Bill Meier 34b16e6223 Use the correct name for libwsutil
svn path=/trunk/; revision=25333
2008-05-20 23:41:10 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Anders Broman 9cc9c92e75 Fix some of the Errors/warnings detected by checkapi,
make non ASCII char a warning for now.

svn path=/trunk/; revision=25240
2008-05-05 20:38:27 +00:00
Jaap Keuter 098d297303 Running glib 2.16 on 32 bit platform requires this lempar.c change in addition to revision 24710.
Makefiles updated to make new lempar.c effective in build rules.

svn path=/trunk/; revision=24718
2008-03-23 08:58:52 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Anders Broman 6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Tomas Kukosa ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Bill Meier 4644ce7263 Fix Windows maintainer-clean/distclean/clean to recurse thru subdirs only once (instead of worst-case 1+2+3 times)
svn path=/trunk/; revision=23187
2007-10-15 16:44:31 +00:00
Jörg Mayer 094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Luis Ontanon ca2683dc8b This was missing
svn path=/trunk/; revision=22679
2007-08-26 23:24:49 +00:00
Guy Harris 71070dd6d8 Treat runlex.sh-generated headers differently from Flex-generated .c
files - for one thing, the former aren't compiled into .o or .obj files.

svn path=/trunk/; revision=22452
2007-08-04 08:04:17 +00:00
Guy Harris 5be4499ad1 Add a script as a front-end for Flex, to work around various problems,
such as the fact that Flex strips all but the last component of the "-o"
argument, and that it doesn't generate a header file to declare routines
the generated lexical analyzer defines.  Use that script when building
lexical analyzers, and, for each lexical analyzer, include the generated
header file in the generated analyzer.

svn path=/trunk/; revision=22446
2007-08-04 02:13:52 +00:00
Guy Harris 46be54cee3 Add a Makefile.nmake.inc file, to hold rules etc. used by multiple
Makefile.nmake files; currently, it has the (F)lex-to-C rule and a
.SUFFIXES pseudo-rule to add .l to the list of suffixes.  Have
Makefile.nmake files with .l.c rules include Makefile.nmake.inc to get
that rule.

The names Makefile.am.inc and Makefile.nmake.inc aren't necessarily the
right names for the files in question.

Use $(PACKAGE) in the Mate plugin's Makefile, rather than "mate".

svn path=/trunk/; revision=22437
2007-08-01 22:20:38 +00:00
Guy Harris 61dd46fa9c Use a common .l.c rule for running Flex on .l files, just as is done on
UN*X.

svn path=/trunk/; revision=22434
2007-08-01 00:22:25 +00:00
Luis Ontanon ae48b50f17 Windows too needs diam_dict.c
svn path=/trunk/; revision=22320
2007-07-16 06:06:21 +00:00
Gerald Combs f60e81aaac Fix compilation under VS6 (hopefully without breaking compilation
anywhere else).  Instead of using getaddrinfo() and getnameinfo(),
promote inet_pton.c and inet_ntop.c to the top level and use those
routines instead.

(It's 2007, for crying out loud.  Why is this even an issue?)

svn path=/trunk/; revision=22075
2007-06-11 18:26:09 +00:00
Guy Harris 6ea3d47e77 "make maintainer-clean" cleans up everything that "make distclean" does;
there's no need for files in DISTCLEANFILES to be in
MAINTAINERCLEANFILES as well.

In epan, split the generated source files into those that should be
cleaned by "make distclean" and those that shouldn't, and have
DISTCLEANFILES include only the ones that should be cleaned by "make
distclean" and have MAINTAINERCLEANFILES include the ones that shouldn't
be cleaned by "make distclean".  This should fix bug 1595.

The generated source files don't need to be in EXTRA_DIST.

Use LIBWIRESHARK_DISTCLEAN_GENERATED_SRC and
LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC in epan/Makefile.nmake.

svn path=/trunk/; revision=21882
2007-05-22 07:21:12 +00:00
Sebastien Tandel dd7753ab2c Since code generated by lex may trigger gcc warnings, we are now generating two
libraries. A single library is generated with the lex code without the barrier
"stop on warning". Another library is generated from the remaining source
files with the "stop on warning" barrier.


svn path=/trunk/; revision=21813
2007-05-17 17:08:11 +00:00
Ulf Lamping 2f53056ba3 fix manifest error: for dll's mt.exe must be given ;2
svn path=/trunk/; revision=21734
2007-05-09 06:32:52 +00:00
Ulf Lamping 56ddeb6b85 embed the manifest files for the unittest exe's as well
svn path=/trunk/; revision=21697
2007-05-06 09:24:36 +00:00
Ulf Lamping 0abc3ba979 instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Bill Meier 6386eda24c Addt'l fixes so suite-unittests will run under windows
svn path=/trunk/; revision=21546
2007-04-24 03:43:08 +00:00
Richard van der Hoff 674306a87d following advice from Gerald, Graham Bloice, and others, let's try copying the unit test executables into the wireshark-gtk2 directory before running them.
svn path=/trunk/; revision=21472
2007-04-18 22:31:47 +00:00
Bill Meier e6a1e67017 Fix for link commands for exntest.exe, tvbtest.exe and reassemble_test.exe;
(Seems to work using vc6 on Windows XP).

svn path=/trunk/; revision=21400
2007-04-13 01:53:14 +00:00
Richard van der Hoff dae27a8aa6 try linking against user32.lib and wsock32.lib
svn path=/trunk/; revision=21386
2007-04-11 23:20:02 +00:00
Richard van der Hoff 0d6e4649f5 fix typos
svn path=/trunk/; revision=21382
2007-04-11 12:26:02 +00:00
Richard van der Hoff d1f795d28e right; this is going badly.
Let's take a different tack: include only the bare minimum, and set up stubs for everything else.

svn path=/trunk/; revision=21379
2007-04-11 00:22:58 +00:00
Richard van der Hoff e83c397ce3 user32.lib and wsock32.lib shouldn't be make dependencies
svn path=/trunk/; revision=21365
2007-04-10 13:46:33 +00:00
Richard van der Hoff d72a70d653 more libs, more stubs... i'll get there one day
svn path=/trunk/; revision=21363
2007-04-10 11:51:16 +00:00
Richard van der Hoff ecbeb10d7f hrm, we even need dissectors.lib
svn path=/trunk/; revision=21353
2007-04-08 13:33:30 +00:00