aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
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
2012-08-16Copy over the C runtime DLLs if MSVCR_DLL is defined.Gerald Combs1-0/+1
svn path=/trunk/; revision=44544
2012-07-25Revert parts of r43978 and r43976 so that we can catch updates inGerald Combs1-12/+4
subdirectories. svn path=/trunk/; revision=44014
2012-07-25Make sure xcopy can figure things out on its own.Gerald Combs1-3/+3
svn path=/trunk/; revision=43979
2012-07-25Make sure wireshark.exe and tshark.exe don't depend on pseudotargets.Gerald Combs1-6/+14
svn path=/trunk/; revision=43978
2012-07-24Fix the dependencies for wireshark.exe and tshark.exe and use "xcopyGerald Combs1-5/+5
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in packaging\nsis\Makefile.nmake. This keeps us from clobbering existing files in wireshark-gt2 unnecessarily. svn path=/trunk/; revision=43976
2012-07-20WiMAX OFDMA PHY SAP dissector plugin ↵Michael Mann1-0/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) svn path=/trunk/; revision=43844
2012-07-12Use win32_open_file in qtshark on Windows.Gerald Combs1-6/+7
svn path=/trunk/; revision=43677
2012-06-25Revert 43481: linking dftest against libui was not the problem.Jeff Morriss1-1/+1
svn path=/trunk/; revision=43488
2012-06-25From Tony Trinh:Anders Broman1-1/+1
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25Move get_args_as_string from ui/util.c into wsutil (maybe not to the bestJeff Morriss1-1/+1
module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
2012-06-21Move a bunch of common code in the file chooser dialog loops into aGuy Harris1-1/+1
routine to run a file chooser dialog. On Windows, add to that code to resolve shell links ("shortcuts"), adopted from the Sylpheed mail reader. (That code requires a pile of OLE stuff, so link with the OLE library.) Make it a bit easier to configure ui/gtk/capture_file_dlg.c to use GTK+ dialogs on Windows, but continue to default to using the Win32 dialogs, at least for now. svn path=/trunk/; revision=43439
2012-06-21Try to fix tarball compilation on Windows.Gerald Combs1-2/+0
svn path=/trunk/; revision=43428
2012-06-20Remove HAVE_WIRELESS_TOOLBAR from the other build systems.Jörg Mayer1-1/+0
svn path=/trunk/; revision=43419
2012-06-19Start to have an generic wireless toolbar. Sligtly modified patch from Anders Broman1-0/+1
Pontus Fuchs. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973 svn path=/trunk/; revision=43354
2012-06-13Add a comment as to .bsc files seemingly not usable with VS2010.Bill Meier1-0/+3
svn path=/trunk/; revision=43232
2012-06-13wireshark.bsc dependencies: fix a typo; add 2 which are missing.Bill Meier1-4/+6
svn path=/trunk/; revision=43229
2012-06-05Add the GeoIP DLL.Gerald Combs1-0/+1
svn path=/trunk/; revision=43128
2012-06-05Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNUGerald Combs1-0/+1
toolchain version but that's a separate issue.) svn path=/trunk/; revision=43124
2012-06-04Make it possible to build with GTK3 on WindowsAnders Broman1-1/+23
svn path=/trunk/; revision=43083
2012-06-01No more GIOP plugins, no more GIOP plugin directory.Guy Harris1-1/+0
svn path=/trunk/; revision=42980
2012-05-31Clean GeoIP-1.4.8-*-win??ws folder with setup targetPascal Quantin1-0/+1
svn path=/trunk/; revision=42938
2012-05-30Back out previous change.Gerald Combs1-1/+1
svn path=/trunk/; revision=42907
2012-05-30Extract into the right directory.Gerald Combs1-1/+1
svn path=/trunk/; revision=42906
2012-05-29Use GeoIP 1.4.8 which includes a DLL instead of a static library.Gerald Combs1-1/+5
svn path=/trunk/; revision=42905
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 08:58:45 +0000