aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
Commit message (Collapse)AuthorAgeFilesLines
* Make it easier to switch between GTK2 and GTK3.Anders Broman2012-11-191-1/+4
| | | | svn path=/trunk/; revision=46082
* The U3 and PortableApps packaging processes depend on simpleGerald Combs2012-10-191-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
* Add PROGRAM_NAME and INSTALL_DIR to ui\qt\config.pri. Currently unused.Gerald Combs2012-10-151-0/+2
| | | | svn path=/trunk/; revision=45561
* Start making the program name "wireshark" configurable.Anders Broman2012-10-151-5/+5
| | | | svn path=/trunk/; revision=45558
* Include setup.ini in the tarball.Anders Broman2012-10-121-0/+1
| | | | | | Copy setup.ini to etc/gtk-3.0 svn path=/trunk/; revision=45497
* Revert 45116. Developer's probably don't want the user-guide.chm that they ↵Chris Maynard2012-09-251-1/+0
| | | | | | get from the setup step as it's not going to be up-to-date. svn path=/trunk/; revision=45121
* We're downloading the user-guide as part of the setup, so we might as well ↵Chris Maynard2012-09-251-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
* Fix mispelling of reordercap.exe target.Martin Mathieson2012-09-241-1/+1
| | | | svn path=/trunk/; revision=45093
* From Jim Young, bug 7745.Martin Mathieson2012-09-241-4/+20
| | | | | | Add Makefile support for reordercap. svn path=/trunk/; revision=45090
* Use guilibsdll and htmlhelp.lib in the Qt build.Gerald Combs2012-09-191-0/+4
| | | | svn path=/trunk/; revision=44996
* From Chris Maynard via ↵Jeff Morriss2012-09-181-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
* Compile and install schemas if GTK3 is used, nsis needs update tooAnders Broman2012-09-161-0/+3
| | | | svn path=/trunk/; revision=44923
* Remove our local copy of WinPcap and download it fromGerald Combs2012-09-131-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
* Minor tweek for GTK3Anders Broman2012-09-131-0/+3
| | | | svn path=/trunk/; revision=44887
* Copy over the C runtime DLLs if MSVCR_DLL is defined.Gerald Combs2012-08-161-0/+1
| | | | svn path=/trunk/; revision=44544
* Revert parts of r43978 and r43976 so that we can catch updates inGerald Combs2012-07-251-12/+4
| | | | | | subdirectories. svn path=/trunk/; revision=44014
* Make sure xcopy can figure things out on its own.Gerald Combs2012-07-251-3/+3
| | | | svn path=/trunk/; revision=43979
* Make sure wireshark.exe and tshark.exe don't depend on pseudotargets.Gerald Combs2012-07-251-6/+14
| | | | svn path=/trunk/; revision=43978
* Fix the dependencies for wireshark.exe and tshark.exe and use "xcopyGerald Combs2012-07-241-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
* WiMAX OFDMA PHY SAP dissector plugin ↵Michael Mann2012-07-201-0/+1
| | | | | | (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) svn path=/trunk/; revision=43844
* Use win32_open_file in qtshark on Windows.Gerald Combs2012-07-121-6/+7
| | | | svn path=/trunk/; revision=43677
* Revert 43481: linking dftest against libui was not the problem.Jeff Morriss2012-06-251-1/+1
| | | | svn path=/trunk/; revision=43488
* From Tony Trinh:Anders Broman2012-06-251-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
* Move get_args_as_string from ui/util.c into wsutil (maybe not to the bestJeff Morriss2012-06-251-1/+1
| | | | | | | | module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
* Move a bunch of common code in the file chooser dialog loops into aGuy Harris2012-06-211-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
* Try to fix tarball compilation on Windows.Gerald Combs2012-06-211-2/+0
| | | | svn path=/trunk/; revision=43428
* Remove HAVE_WIRELESS_TOOLBAR from the other build systems.Jörg Mayer2012-06-201-1/+0
| | | | svn path=/trunk/; revision=43419
* Start to have an generic wireless toolbar. Sligtly modified patch from Anders Broman2012-06-191-0/+1
| | | | | | | | Pontus Fuchs. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973 svn path=/trunk/; revision=43354
* Add a comment as to .bsc files seemingly not usable with VS2010.Bill Meier2012-06-131-0/+3
| | | | svn path=/trunk/; revision=43232
* wireshark.bsc dependencies: fix a typo; add 2 which are missing.Bill Meier2012-06-131-4/+6
| | | | svn path=/trunk/; revision=43229
* Add the GeoIP DLL.Gerald Combs2012-06-051-0/+1
| | | | svn path=/trunk/; revision=43128
* Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNUGerald Combs2012-06-051-0/+1
| | | | | | toolchain version but that's a separate issue.) svn path=/trunk/; revision=43124
* Make it possible to build with GTK3 on WindowsAnders Broman2012-06-041-1/+23
| | | | svn path=/trunk/; revision=43083
* No more GIOP plugins, no more GIOP plugin directory.Guy Harris2012-06-011-1/+0
| | | | svn path=/trunk/; revision=42980
* Clean GeoIP-1.4.8-*-win??ws folder with setup targetPascal Quantin2012-05-311-0/+1
| | | | svn path=/trunk/; revision=42938
* Back out previous change.Gerald Combs2012-05-301-1/+1
| | | | svn path=/trunk/; revision=42907
* Extract into the right directory.Gerald Combs2012-05-301-1/+1
| | | | svn path=/trunk/; revision=42906
* Use GeoIP 1.4.8 which includes a DLL instead of a static library.Gerald Combs2012-05-291-1/+5
| | | | svn path=/trunk/; revision=42905
* Try using an OBS-derived Gtk2 bundle, second try.Gerald Combs2012-05-141-13/+28
| | | | svn path=/trunk/; revision=42623
* Make it possible to download the GTK3 packageAnders Broman2012-04-211-1/+2
| | | | svn path=/trunk/; revision=42174
* Switch back to the gtk.org version of the GTK+ bundle since its CairoGerald Combs2012-04-201-29/+14
| | | | | | doesn't crash. svn path=/trunk/; revision=42171
* Clean gnutls-2.12.18-*-win??ws folder with setup targetpascal2012-04-201-0/+1
| | | | svn path=/trunk/; revision=42170
* Switch to our custom GTK+ bundles derived from openSUSE Build ServiceGerald Combs2012-04-191-14/+29
| | | | | | packages. Sort and normalize our DLL lists. Add several new required DLLs. svn path=/trunk/; revision=42143
* Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss2012-04-041-1/+1
| | | | | | | | | | | | from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
* Give qmake a VERSION it will accept.Gerald Combs2012-03-251-1/+3
| | | | svn path=/trunk/; revision=41762
* Fix the Qt build for Win64.Gerald Combs2012-03-251-0/+5
| | | | svn path=/trunk/; revision=41761
* Capitalize "Wireshark" in various package names.Gerald Combs2012-03-161-2/+2
| | | | svn path=/trunk/; revision=41621
* CVARSDLL hasn't been used (is undefined) for a while....Bill Meier2012-03-011-2/+2
| | | | | | (This commit should have been part of SVNB #41180). svn path=/trunk/; revision=41254
* Update clean_setup list of win32-libs to be deleted.Bill Meier2012-03-011-8/+10
| | | | svn path=/trunk/; revision=41252
* Build the TShark taps into a static libcliui library in the ui/cliGuy Harris2012-02-191-22/+14
| | | | | | | directory, and link TShark with that; let's see if this fixes the Windows buildbots. svn path=/trunk/; revision=41070