aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2015-05-31Fix zlib cmakeGraham Bloice1-1/+2
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-16androiddump: stop recompiling systematically androiddump.c with nmakePascal Quantin1-2/+7
Our default rules are confused because source file is in a subfolder of the nmake makefile Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b Reviewed-on: https://code.wireshark.org/review/8068 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-15Set the extcap working directory on Windows.Gerald Combs1-11/+3
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-12Windows: fix generation of PortableApps.com installerPascal Quantin1-0/+2
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07 Reviewed-on: https://code.wireshark.org/review/8036 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Add missing androiddump stuffMichal Labedzki1-1/+31
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-11Add removal of zlib 1.2.8 folderPascal Quantin1-0/+1
Change-Id: I064cdfb46db49208b271806d7f697e3128e040a9 Reviewed-on: https://code.wireshark.org/review/8022 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-10Move the PortabaleApps packaging up one level.Gerald Combs1-8/+6
Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-06Use zlib 1.2.8 on Windows.Gerald Combs1-10/+5
Change-Id: I3df88b1e891f43cd6b6ed089f6c3d20a942e68bc Reviewed-on: https://code.wireshark.org/review/7952 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13Add a test-programs target everywhere.Gerald Combs1-0/+5
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs1-1/+1
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-1/+1
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Qt: Add more version and packaging information to the main window.Gerald Combs1-0/+1
Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-07MSVC: Fix opting out of librariesOrgad Shaneh1-0/+3
When *_DIR variables are defined (even if empty), nmake tries to build them and fails. Don't set them at all if not configured to. Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 Reviewed-on: https://code.wireshark.org/review/6365 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier1-1/+1
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-2/+2
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-13Add Kerberos 3.2.2 package for Win64Pascal Quantin1-4/+12
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb Reviewed-on: https://code.wireshark.org/review/4661 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13Upgrade Win64 GTK2 package to 2.24.23-3.39Pascal Quantin1-6/+1
Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7 Reviewed-on: https://code.wireshark.org/review/4656 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-02Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 packagePascal Quantin1-0/+1
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e Reviewed-on: https://code.wireshark.org/review/4401 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-29GTK+: Revert back to 2.24.14-1.1 on Win64.Gerald Combs1-2/+5
As Pascal discovered in https://www.wireshark.org/lists/wireshark-dev/201409/msg00045.html Wireshark-gtk.exe crashes at startup on Windows 8.1 x64 when compiled with the GTK+ 2.24.23-1.1 bundle and Visual C++ 2013. Revert to the Win64 build to the prior GTK+ bundle, which works on my test system. Update the release notes. Make sure we use a libintl-8.dll that's compatible with GnuTLS. Ideally we'd just upgrade or rebuild the GTK+ bundle but so far that hasn't worked. Prior to this I tried: Updating the gtk2 package at build.opensuse.org to 2.24.24. This fails with [ 187s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/gtk+-2.24.24/gtk' [ 187s] /usr/bin/gtk-update-icon-cache --force --ignore-theme-index \ [ 187s] --include-image-data \ [ 187s] --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ [ 187s] mv gtkbuiltincache.h.tmp gtkbuiltincache.h [ 187s] gtk-update-icon-cache: No theme index file. [ 187s] make[2]: *** [gtkbuiltincache.h] Error 1 Switching to the OBS GTK+ 3.14 package. It looks like a lot of our GTK+ code is deprecated, including GtkAction and GtkAttachOptions. Change-Id: I1548c84022f02895e5d424cd61e0fed7b57b2e75 Ping-Bug: 9914 Reviewed-on: https://code.wireshark.org/review/4379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-13GTK+: Make sure we package up Wireshark-gtk.pdb.Gerald Combs1-5/+5
Make sure we use $(PROGRAM_NAME_GTK) consistently. We still need to add the Qt UI .pdb to the archive but I'm not in front of a proper Windows development environment right now. Change-Id: Ie917f68e3e8349fc7955b3b7e68d446b6fe88235 Reviewed-on: https://code.wireshark.org/review/4096 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-13/+13
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-21Extcap Capture InterfaceRoland Knall1-0/+2
Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net> Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: Roland Knall <rknall@gmail.com> Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-14Windows: Clean up text file packaging.Gerald Combs1-8/+7
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending conversion so that we don't depend on unix2dos. Only copy the help toc and text files to the staging directory. Add PowerShell to the Developer's Guide. Fixup some other content. (asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not a problem.) Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71 Reviewed-on: https://code.wireshark.org/review/3487 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-08Put setargv.obj back in the list of objects for mergecap.Guy Harris1-1/+2
This should enable automatic wildcard expansion and fix bug 10354. Add the usual setargv.obj comment for reordercap, which also links with setargv.obj. Change-Id: I2ceee700ae274713bf7a6d5fae0d523e9feca481 Fixes-Bug: 10354 Reviewed-on: https://code.wireshark.org/review/3483 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Rip out the filetap codeEvan Huus1-24/+5
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Ensure that QT5_BASE_DIR is known by QtShark.proPascal Quantin1-0/+1
Otherwise the call to winqtdeploy will fail if it is not already in the PATH Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec Reviewed-on: https://code.wireshark.org/review/3218 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-07-28Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM ↵Pascal Quantin1-21/+21
environment variable is not explicitly set Bug: 10317 Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723 Reviewed-on: https://code.wireshark.org/review/3203 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28Download the right User Guide...Pascal Quantin1-1/+1
Change-Id: Icf1f9bd48f0624226c55a622b7b8f774d103e5ae Reviewed-on: https://code.wireshark.org/review/3224 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-21Obsolete tools/winXX-setup.sh:Joerg Mayer1-24/+63
- Move DOWNLOAD_TAG into config.nmake - Call win-setup.sh directly instead of winXX-setup.sh - TODO: Remove tools/winXX-setup.sh files Change-Id: Ie02b6b468b4f3007f5e2b6a8282e2e6cdf7d1a70 Reviewed-on: https://code.wireshark.org/review/3144 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-10Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."Guy Harris1-29/+29
This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2 Reviewed-on: https://code.wireshark.org/review/2973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09See if we can get rid of the "lib" in front of "wsutil" on Windows.Guy Harris1-29/+29
"libXXX" is a UN*X convention; see whether we can do without it on Windows. Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85 Reviewed-on: https://code.wireshark.org/review/2968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04rawshark needs libcaputils.Guy Harris1-2/+2
Change-Id: I38409f5ceef1c906dccb13284d2fe2dfd2383b67 Reviewed-on: https://code.wireshark.org/review/2845 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-11/+21
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Fix bulding of reordercapAndersBroman1-2/+3
Change-Id: I9898685d20c684c05f505275804d9c6588bba645 Reviewed-on: https://code.wireshark.org/review/2811 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03Try to fix the build by adding version_info.obj to the link stage ofAndersBroman1-3/+3
text2pcap and in both lines for mergecap. Follow up of https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd Change-Id: I4b44965604eec92415b8bb6e9267dadbb2937f7a Reviewed-on: https://code.wireshark.org/review/2807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-03We have to include version_info.obj manually in the dependencies for text2pcap.Guy Harris1-1/+5
Add a comment indicating why we're not generating text2pcap_OBJECTS from text2pcap_SOURCES and using that. Change-Id: I8235080c3ea2bb31861a9c4f5aee9e6ce6a0808c Reviewed-on: https://code.wireshark.org/review/2801 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make --help and --version information a bit more uniform.Guy Harris1-7/+0
Have --version print the version number, the copyright information, the "compiled with" information, the "running on/with" information, and the compiler information. Have --help print the version number, a one-line summary of what the program does, a reference to http://www.wireshark.org for more information, a Usage: line, and a list of command-line options. This means programs doing that don't need to include version.h; that's left up to get_ws_vcs_version_info() to do. Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb Reviewed-on: https://code.wireshark.org/review/2794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Fix the QT build on Qt 5.3 or later to use the windeployqt toolGraham Bloice1-12/+2
to copy the rquired Qt files into the runtime directory Qt 5.2 is broken as windeployqt doesn't take the required --release flag Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so that the Qt build copies the required files instead of the entire gnutls bin dir twice (the variables expanded to nothing). Add support for autodetection of Qt 5.3.0 with msvc2013 Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c Reviewed-on: https://code.wireshark.org/review/2734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-30Windows: fix update of version information in wireshark and tsharkPascal Quantin1-1/+1
Broken since gc46329c Change-Id: I00146675d16db021e2cbb7b16841ea9ecb1439b9 Reviewed-on: https://code.wireshark.org/review/2703 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-27Have the makefile run windepoyqt if it exists to copy the required dlls to ↵AndersBroman1-0/+11
the install dir. Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b Reviewed-on: https://code.wireshark.org/review/2644 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-24Add the capchild directory to some lists of rules.Guy Harris1-0/+8
Change-Id: Ic06cf8005a16cc61c8e3ae506dba4c4916ab6471 Reviewed-on: https://code.wireshark.org/review/2626 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24Fix name of library.Guy Harris1-1/+1
Change-Id: I463637a6218a86ed6dbd95019f33d8b999bcaaf2 Reviewed-on: https://code.wireshark.org/review/2596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Move the routines to talk to dumpcap into a static libcapchild.Guy Harris1-5/+11
This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Build version.h before trying to build wsutil.Guy Harris1-1/+1
Code in wsutil includes it. Change-Id: I02cb49c3a672955b74a183996d2e815b8d55b668 Reviewed-on: https://code.wireshark.org/review/2539 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18Get rid of obsolete references to nettlePascal Quantin1-1/+0
Bug: 2089 Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83 Reviewed-on: https://code.wireshark.org/review/2388 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-16The broken python support is beeing removed.AndersBroman1-13/+1
Change-Id: I5f4d3d381d8629158c9d1bea344b5a2e64a0f462 Reviewed-on: https://code.wireshark.org/review/2282 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-4/+11
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-16Build with GTK+ 2.24.23.Gerald Combs1-0/+9
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-01Add a comment re certain variables beibg defined in win32.mak.Bill Meier1-1/+1
Change-Id: I9246a1786a5bf8c48744378f25a66f6881caed81 Reviewed-on: https://code.wireshark.org/review/1459 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-05Upgrade Windows builds to Lua 5.2.3Pascal Quantin1-2/+2
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0 Reviewed-on: https://code.wireshark.org/review/974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>