aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2014-04-01Copy randpkt.exe & randpkt.pdb to install directory during windows build.Bill Meier1-0/+2
Change-Id: I6ef6b181897bd3d35dc94ebb2d04aaa209d8df6e Reviewed-on: https://code.wireshark.org/review/904 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-2/+3
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-13/+16
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-27Make it easier to try GTK 3.6Anders Broman1-3/+3
svn path=/trunk/; revision=54986
2014-01-16Partially revert r54824.Gerald Combs1-1/+4
svn path=/trunk/; revision=54825
2014-01-16Allow the use of Win flex-bison and document how to do that.Gerald Combs1-4/+1
svn path=/trunk/; revision=54824
2014-01-09cfile.c is in WIRESHARK_COMMON_SRC so there's no need to add it again.Gerald Combs1-1/+0
svn path=/trunk/; revision=54675
2014-01-08At least some of the files in PLATFORM_CAPTURE_SRC are needed byGuy Harris1-1/+1
programs that use {lib,win}pcap but that don't capture traffic, such as rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake. svn path=/trunk/; revision=54671
2014-01-08Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.Guy Harris1-1/+4
svn path=/trunk/; revision=54669
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-6/+58
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2013-12-13Add a "captype" file that just reports the type of a capture file, basedGuy Harris1-11/+27
on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-3/+0
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer1-1/+1
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-21Try to get qmake to create wireshark-tap-register.c.Gerald Combs1-0/+3
svn path=/trunk/; revision=53466
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-2/+1
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-10-27Fix relative path now that u3 folder has been removedPascal Quantin1-3/+3
svn path=/trunk/; revision=52898
2013-10-27Remove U3 code and packaging.Gerald Combs1-15/+0
svn path=/trunk/; revision=52896
2013-10-17If static analysis is enabled disable error checking when compiling theGerald Combs1-0/+7
Qt code. This should hopefully work around a builder issue. svn path=/trunk/; revision=52661
2013-10-12Update the User Guide for the upcoming 1.11.0 releasePascal Quantin1-1/+1
svn path=/trunk/; revision=52576
2013-10-12Update to the latest Windows library tags. Add an "install_qt" target.Gerald Combs1-1/+4
svn path=/trunk/; revision=52558
2013-10-12QT_DIR → QT5_BASE_DIR. This matches the CMake environment.Gerald Combs1-9/+9
svn path=/trunk/; revision=52557
2013-10-11Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.Gerald Combs1-0/+6
svn path=/trunk/; revision=52556
2013-10-11"install-generated-files" depends on "doc". Set dependenciesGerald Combs1-2/+2
accordingly. svn path=/trunk/; revision=52530
2013-10-11qtshark.exe doesn't depend on tshark_OBJECTS.Gerald Combs1-1/+1
svn path=/trunk/; revision=52529
2013-10-11Don't return an error if cleaning the Qt directory fails.Gerald Combs1-3/+3
svn path=/trunk/; revision=52525
2013-10-10Revert the changes made to resolve ↵Chris Maynard1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res). #BACKPORT(1.10) svn path=/trunk/; revision=52506
2013-10-10As the Qt build will not use portaudio, we don't need toJörg Mayer1-3/+2
put portaudio flags into config.pri svn path=/trunk/; revision=52485
2013-10-08Add some QT_DIR checks.Gerald Combs1-0/+8
svn path=/trunk/; revision=52459
2013-10-08Add an initial Qt configuration and makefile targets.Gerald Combs1-0/+19
svn path=/trunk/; revision=52456
2013-09-11Define NOMINMAX for the entire Qt build.Gerald Combs1-1/+3
svn path=/trunk/; revision=51955
2013-08-07Switch to make-services.py. Fix some variable names and version tests.Gerald Combs1-2/+2
svn path=/trunk/; revision=51189
2013-07-30Add a routine to get application memory usage to epan.Anders Broman1-3/+3
svn path=/trunk/; revision=51023
2013-07-28clean target misses some build artefacts; capinfos.lib and editcap.libGraham Bloice1-1/+1
svn path=/trunk/; revision=50972
2013-07-24Make it possible to use GetProcessMemoryInfo on Windows.Anders Broman1-1/+5
svn path=/trunk/; revision=50865
2013-07-20GeoIP 1.5.1.Gerald Combs1-0/+1
svn path=/trunk/; revision=50742
2013-07-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-1/+0
there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). svn path=/trunk/; revision=50598
2013-07-12Move the print modules into epan.Jeff Morriss1-4/+2
svn path=/trunk/; revision=50526
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-3/+3
make use of it in editcap and mergecap for listing encapsulation types. For example: Before: user0 - USER 0 user1 - USER 1 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 After: user0 - USER 0 user1 - USER 1 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 svn path=/trunk/; revision=50482
2013-06-25Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).Jeff Morriss1-2/+2
./configure now accepts: --with-gtk2 : enabled by default; exclusive of --with-gtk3 --with-gtk3 : disabled by default; exclusive of --with-gtk2 --with-qt : disabled by default, can be specified with gtk --enable-wireshark : controls whether *any* GUI is built If Qt is enabled then a new program is created: "wireshark-qt". "wireshark" remains the Gtk+ version. svn path=/trunk/; revision=50147
2013-06-25makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.Chris Maynard1-63/+63
svn path=/trunk/; revision=50140
2013-05-30Upgrade user manualPascal Quantin1-1/+1
svn path=/trunk/; revision=49634
2013-05-29Correct the c-ares directory name in the clean_setup target.Chris Maynard1-1/+1
#BACKPORT(1.10) svn path=/trunk/; revision=49616
2013-05-22Add dftest.exe to EXECUTABLES. For clean-local target, clean randpkt.exe, ↵Chris Maynard1-3/+4
not randpkt.ext. svn path=/trunk/; revision=49514
2013-05-01Install and uninstall our global profiles.Gerald Combs1-0/+5
svn path=/trunk/; revision=49123
2013-03-09Switch to WinPcap 4.1.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=48207
2013-03-08Switch to c-ares 1.9.1.Gerald Combs1-0/+1
svn path=/trunk/; revision=48191
2013-03-07Revert part of r48021: those hunks are no more needed with r48170Pascal Quantin1-4/+0
svn path=/trunk/; revision=48171
2013-03-07From Balint:Gerald Combs1-2/+2
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol" warnings. This reverts commit r48158. [PATCH 2/2] Employ small hack in editcap to link with a few objects from libwireshark properly From me: Add the ability to reset symbol exports via ws_symbol_export.h's include guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h in over 200 files so it didn't seem to make sense to remove its include guard entirely. svn path=/trunk/; revision=48170
2013-03-07Try to fix the "LNK4217: locally defined symbol" warnings.Gerald Combs1-2/+2
svn path=/trunk/; revision=48158
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 06:08:15 +0000