Commit Graph

463 Commits

Author SHA1 Message Date
Jörg Mayer e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
2011-08-08 20:35:36 +00:00
Jörg Mayer a28af865bc Looks like the Windows code isn't as clean as the Unix path:
Comment out GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38405
2011-08-08 14:03:53 +00:00
Jörg Mayer 6ef6042641 GTK3 stuff:
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
2011-08-08 13:39:21 +00:00
Anders Broman c11c8b0ee0 svn path=/trunk/; revision=38396 2011-08-07 19:58:13 +00:00
Anders Broman 79501e9198 Revert previous commit.
(Note to self read the description first)

"Returns :
 
a newly-allocated string, with all the upper case characters in str converted to lower case, with semantics that exactly match g_ascii_tolower(). (Note that this is unlike the old g_strdown(), which modified the string in place.)"

svn path=/trunk/; revision=38395
2011-08-07 19:15:17 +00:00
Anders Broman e48dcbaf15 Replace deprecated glib functions.
set DG_DISABLE_DEPRECATED for windows build.

svn path=/trunk/; revision=38394
2011-08-07 19:08:41 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions.
- Include pangocairo.

svn path=/trunk/; revision=38317
2011-08-03 14:54:03 +00:00
Anders Broman 8f54d76a77 - Always build with GSEAL_ENABLE
svn path=/trunk/; revision=38252
2011-07-29 10:12:48 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
2011-07-19 18:22:46 +00:00
Gerald Combs e7fce8ccb8 Pull WIRESHARK_LIBS from the system environment if it's available.
svn path=/trunk/; revision=38114
2011-07-19 16:26:42 +00:00
Anders Broman 46bcd096a8 Include Cairo lib to be able to use caro functions.
svn path=/trunk/; revision=38066
2011-07-17 13:18:55 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.

svn path=/trunk/; revision=37808
2011-06-27 20:48:26 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
2011-06-17 17:52:31 +00:00
Gerald Combs 6e040f6c0d Bump the wiretap version.
svn path=/trunk/; revision=37571
2011-06-06 16:29:23 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP
svn path=/trunk/; revision=37495
2011-05-31 21:38:39 +00:00
Gerald Combs 2c5e7ef953 FOP 0.95 → 1.0.
svn path=/trunk/; revision=37300
2011-05-19 19:03:22 +00:00
Gerald Combs 1c831b6343 1.5.2 → 1.7.0.
svn path=/trunk/; revision=37148
2011-05-14 20:17:37 +00:00
Anders Broman b699fa89ee Move MAIN_MENU_USE_UI_MANAGER outside of if win32.
svn path=/trunk/; revision=37141
2011-05-14 13:15:56 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no].
svn path=/trunk/; revision=37084
2011-05-12 17:14:59 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option.
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
2011-05-12 10:56:26 +00:00
Jeff Morriss 6ff4737f44 On Windows: don't (try but fail--the code did not work) to define
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
2011-04-29 17:30:23 +00:00
Chris Maynard be832727cd Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
2011-04-20 05:21:32 +00:00
Gerald Combs b971a0ef5d Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.
svn path=/trunk/; revision=36722
2011-04-19 19:20:03 +00:00
Anders Broman 25ab8f9594 Ok let's try GTK 2.22 on Win64 too - fix a typo.
svn path=/trunk/; revision=36623
2011-04-13 15:46:39 +00:00
Anders Broman 81e330976e Ok let's try GTK 2.22 on Win64 too.
svn path=/trunk/; revision=36620
2011-04-13 14:38:58 +00:00
Anders Broman 2d38d00656 Try out GTK 2.22
svn path=/trunk/; revision=36619
2011-04-13 13:42:41 +00:00
Anders Broman 8532a6f8af Restore defaults
svn path=/trunk/; revision=36618
2011-04-13 05:43:07 +00:00
Anders Broman 3db53e54ba Build win64 with a modified zlib (google is your friend).
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0

First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.

svn path=/trunk/; revision=36616
2011-04-13 04:47:38 +00:00
Bill Meier 8587721abb Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exe
svn path=/trunk/; revision=36596
2011-04-12 17:53:23 +00:00
Anders Broman b5125be726 Build with zlib-1.2.5 for win32
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586
2011-04-12 15:44:05 +00:00
Gerald Combs d7d45f8072 1.5.1 → 1.5.2. Reenable Babel.
svn path=/trunk/; revision=36540
2011-04-10 17:03:43 +00:00
Gerald Combs 92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
2011-04-05 22:38:12 +00:00
Bill Meier dbc7c80782 Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list)
svn path=/trunk/; revision=36165
2011-03-08 14:55:07 +00:00
Gerald Combs 2009cc6f17 Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
2011-03-01 19:40:51 +00:00
Gerald Combs 6095647db2 Fix a typo.
svn path=/trunk/; revision=36021
2011-02-21 18:42:19 +00:00
Bill Meier 4099dfa603 Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_ERRORS
svn path=/trunk/; revision=35952
2011-02-15 16:56:31 +00:00
Bill Meier dcb5dfe207 Enable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ...
svn path=/trunk/; revision=35951
2011-02-15 16:40:09 +00:00
Gerald Combs 7bd9a9c607 Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environment
variable.

svn path=/trunk/; revision=35946
2011-02-14 18:58:37 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Gerald Combs 2b3eddb842 Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer).
svn path=/trunk/; revision=35688
2011-01-28 18:42:49 +00:00
Gerald Combs 5d46856320 Use the correct processor architecture in our manifest. This lets us
create a usable wireshark.exe for x64 using Visual C++ 10.  Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.

svn path=/trunk/; revision=35687
2011-01-28 00:21:05 +00:00
Gerald Combs 1635ef0ddf 1.5.0 → 1.5.1.
svn path=/trunk/; revision=35639
2011-01-24 19:27:38 +00:00
Chris Maynard 252861e6af Updates for Wireshark portable installer. Using nsis unicode now.
svn path=/trunk/; revision=35300
2010-12-29 20:41:53 +00:00
Stephen Fisher 52b99dc191 Remove "not tested" note on MSVC 2010's vcredist instructions
svn path=/trunk/; revision=35040
2010-11-27 18:52:02 +00:00
Stephen Fisher d1108eebab Remove comment stating that Microsoft Visual Studio 2010 doesn't work since the express edition does (and presumably the full edition does also)
svn path=/trunk/; revision=35031
2010-11-26 17:54:45 +00:00
Bill Meier a6c0c9738f From Michael Wells: Fix "missing path seperator in config.nmake"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378

svn path=/trunk/; revision=34829
2010-11-09 23:03:47 +00:00
Gerald Combs cfe3d49619 From g.khueny via bug 5346:
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by
PYTHON_DIR=C:\Python$(PYTHON_VER). 
It looks like the problem was created by revision 34246.

svn path=/trunk/; revision=34673
2010-10-28 16:29:39 +00:00
Anders Broman b7d293bdc0 Target system changed by mistake.
svn path=/trunk/; revision=34594
2010-10-20 20:49:30 +00:00
Anders Broman 2f9403ab15 Prepartaions to use GTK 2.22
svn path=/trunk/; revision=34593
2010-10-20 20:41:39 +00:00