aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
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
2013-03-04Don't define WS_BUILD_DLL when building capinfos and editcap. In the caseGerald Combs1-2/+2
of capinfos this breaks getopt because optind isn't properly imported. svn path=/trunk/; revision=48072
2013-03-02Try to fix LNK4217 (locally defined symbol imported in function) and C4273 ↵Pascal Quantin1-1/+6
(inconsistent DLL linkage) warnings when compiling for Windows svn path=/trunk/; revision=48021
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-4/+0
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-19Add automatic software update checks for Win32 using WinSparkle. AddGerald Combs1-1/+12
preferences (currently hidden) to disable updates, set the update frequency, and set the update "channel" (stable vs development). Add a "Help" menu item to manually check for updates. svn path=/trunk/; revision=47748
2013-01-07Copy over any mibs that might be in the site directory.Chris Maynard1-0/+1
svn path=/trunk/; revision=46987
2012-12-28Remove redundant SUBSYSTEM link option from link commands.Bill Meier1-11/+14
[ $(guiflags) or $(conflags) specified as part of the link options includes the SUBSYSTEM option ]. svn path=/trunk/; revision=46831
2012-12-21This should get it building on Windows.Michael Tüxen1-3/+3
svn path=/trunk/; revision=46676
2012-12-21Try to get text2pcap building on Windows.Michael Tüxen1-3/+3
svn path=/trunk/; revision=46675
2012-12-18text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).Michael Tüxen1-1/+1
svn path=/trunk/; revision=46600
2012-12-13Bug 3528 - When following an HTTP tcp stream decode gzip data automatically ↵Michael Mann1-2/+2
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528) includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows svn path=/trunk/; revision=46530
2012-12-11Update the User's Guide to 1.9Pascal Quantin1-1/+1
svn path=/trunk/; revision=46503
2012-12-07Update the User's Guide to 1.8Pascal Quantin1-1/+1
svn path=/trunk/; revision=46463
2012-11-19Make it easier to switch between GTK2 and GTK3.Anders Broman1-1/+4
svn path=/trunk/; revision=46082
2012-10-19The U3 and PortableApps packaging processes depend on simpleGerald Combs1-29/+26
defined/undefined checks. Create a bunch of them corresponding to the various components that GTK2 and GTK3 need and plumb the packaging files accordingly. Tested only with GTK2 but GTK3 *should* work. svn path=/trunk/; revision=45659
2012-10-15Add PROGRAM_NAME and INSTALL_DIR to ui\qt\config.pri. Currently unused.Gerald Combs1-0/+2
svn path=/trunk/; revision=45561
2012-10-15Start making the program name "wireshark" configurable.Anders Broman1-5/+5
svn path=/trunk/; revision=45558
2012-10-12Include setup.ini in the tarball.Anders Broman1-0/+1
Copy setup.ini to etc/gtk-3.0 svn path=/trunk/; revision=45497
2012-09-25Revert 45116. Developer's probably don't want the user-guide.chm that they ↵Chris Maynard1-1/+0
get from the setup step as it's not going to be up-to-date. svn path=/trunk/; revision=45121
2012-09-25We're downloading the user-guide as part of the setup, so we might as well ↵Chris Maynard1-0/+1
copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended". svn path=/trunk/; revision=45116
2012-09-24Fix mispelling of reordercap.exe target.Martin Mathieson1-1/+1
svn path=/trunk/; revision=45093
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-4/+20
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-19Use guilibsdll and htmlhelp.lib in the Qt build.Gerald Combs1-0/+4
svn path=/trunk/; revision=44996
2012-09-18From Chris Maynard via ↵Jeff Morriss1-0/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 : Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but I've left those out to match what we have on *NIX now). svn path=/trunk/; revision=44988
2012-09-16Compile and install schemas if GTK3 is used, nsis needs update tooAnders Broman1-0/+3
svn path=/trunk/; revision=44923
2012-09-13Remove our local copy of WinPcap and download it fromGerald Combs1-0/+2
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip files ending in .zip. PortableApps and U3 packaging changes are untested. svn path=/trunk/; revision=44888
2012-09-13Minor tweek for GTK3Anders Broman1-0/+3
svn path=/trunk/; revision=44887
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 17:35:16 +0000