aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2010-11-09From Michael Wells: Fix "missing path seperator in config.nmake"Bill Meier1-1/+1
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378 svn path=/trunk/; revision=34829
2010-10-28From g.khueny via bug 5346:Gerald Combs1-6/+6
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by PYTHON_DIR=C:\Python$(PYTHON_VER). It looks like the problem was created by revision 34246. svn path=/trunk/; revision=34673
2010-10-20Target system changed by mistake.Anders Broman1-1/+1
svn path=/trunk/; revision=34594
2010-10-20Prepartaions to use GTK 2.22Anders Broman1-3/+8
svn path=/trunk/; revision=34593
2010-10-05Use the new GTK bundles.Anders Broman1-2/+2
svn path=/trunk/; revision=34382
2010-10-03Make "bpf_image" available on Windows. This enables the "Compile BPF" button ↵Sake Blok1-0/+2
and "dumpcap -d" on Windows. svn path=/trunk/; revision=34357
2010-10-03Retry of SVN 34338, now tested on my WinXP dev VM:Sake Blok1-0/+2
Use pcap_open_dead instead of pcap_create for the compile BPF button. svn path=/trunk/; revision=34340
2010-09-24Allow up to Python 2.7 now (was 2.6) and move Python build statements into ↵Stephen Fisher1-39/+33
same part of nmake file for ease of use. svn path=/trunk/; revision=34246
2010-09-23Assume we HAVE_GZCLEARERR on Windows and when using cmakeJeff Morriss1-0/+1
svn path=/trunk/; revision=34192
2010-09-16Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().Gerald Combs1-0/+10
svn path=/trunk/; revision=34137
2010-08-26I suspect the changes to config.nmake committed in SVN #33942 were not intended.Bill Meier1-2/+2
Revert the changes (for now ?) so the Buildbot will run again. svn path=/trunk/; revision=33945
2010-08-26Doxygen fixes.Anders Broman1-2/+2
svn path=/trunk/; revision=33942
2010-08-25Add ws_load_library and ws_module_open, which respectively callGerald Combs1-0/+2
LoadLibrary and g_module_open only for the program directory and system directory on Windows. Use them to replace a bunch of LoadLibrary and g_module_open calls. Use the extension ".dll" for all the DLLs that we load. Add comments about DLL loading in Python. svn path=/trunk/; revision=33924
2010-08-25Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 ↵Jeff Morriss1-1/+1
on Win64 too (for consistency more than anything I think). svn path=/trunk/; revision=33923
2010-08-25Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps ↵Jeff Morriss1-1/+1
builds to pick up WinPcap again. svn path=/trunk/; revision=33921
2010-08-05Remove experimental marker from NEW_PACKET_LIST.Jaap Keuter1-4/+2
svn path=/trunk/; revision=33719
2010-06-071.3.6 -> 1.5.0Gerald Combs1-2/+2
svn path=/trunk/; revision=33138
2010-06-01From Kovarththanan Rajaratnam via bug 3500:Gerald Combs1-22/+79
Sébastien's initial commit [1] didn't contain support for embedding Python on Windows. [1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529 From me: Comment out PYTHON_EMBED for now. Start a list of known Python+CRT versions. Add get_wspython_dir to libwireshark.def. svn path=/trunk/; revision=33036
2010-05-06Our default target platform is still win32.Gerald Combs1-1/+1
svn path=/trunk/; revision=32698
2010-05-06Checking in Stigs changes fromAnders Broman1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475 BUT not activating the check for pcap_create() pcap_set_buffer_size() This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic. The code for handling the 'B' option should be OK in any case. svn path=/trunk/; revision=32688
2010-05-051.3.5 -> 1.3.6.Gerald Combs1-1/+1
svn path=/trunk/; revision=32667
2010-04-22Manifests are not needed when building with VC10.Bill Meier1-1/+7
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10. See: http://msdn.microsoft.com/en-us/library/dd293574.aspx svn path=/trunk/; revision=32540
2010-04-21Add settings for "Microsoft Visual Studio 2010" note thatAnders Broman1-2/+22
Wireshark does not build with Visual studio 10 yet. svn path=/trunk/; revision=32529
2010-04-09Rename README.win32 to README.windows and add a 64-bit download link.Gerald Combs1-2/+6
Add tools/textify.sh, which makes a Notepad-clickable copy of a text file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt. Remove tools/unix2dos.pl and use Cygwin's u2d instead. svn path=/trunk/; revision=32440
2010-04-05Add coment about why 'links' fails if it is used to generate release-notes.txt Bill Meier1-1/+1
svn path=/trunk/; revision=32387
2010-03-311.3.4 -> 1.3.5.Gerald Combs1-1/+1
svn path=/trunk/; revision=32345
2010-03-26Update c-ares to 1.7.1.Gerald Combs1-2/+2
svn path=/trunk/; revision=32293
2010-03-17Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, andGuy Harris1-4/+12
HAVE_PCAP_SET_DATALINK only if we have the WinPcap development package; otherwise, don't define them - if you don't have the WinPcap development package when building on Windows, we don't define HAVE_LIBPCAP, so we won't include any of the code controlled by those ifdefs in any case, and, if you do have the WinPcap development package, you'll need to have the 4.1 version (you won't need WinPcap 4.1 at run time, but you will need the 4.1 development package at build time). svn path=/trunk/; revision=32230
2010-03-17Use the right #define value to check whether WinPcap hasGuy Harris1-0/+1
pcap_free_datalinks(). *Set* that #define, while we're at it. svn path=/trunk/; revision=32220
2010-02-24Use the latest GTK+ 2.16 bundle. For the Win32 build this means downgradingGerald Combs1-6/+7
from GTK+ 2.18. According to https://bugzilla.gnome.org/show_bug.cgi?id=598299 we should probably hold off on using 2.18 for a while. svn path=/trunk/; revision=31992
2010-02-15Correct GTK+ package for Win64.Guy Harris1-1/+1
svn path=/trunk/; revision=31890
2010-02-15Use the latest GTK bundle (2.18.7)Anders Broman1-5/+10
svn path=/trunk/; revision=31882
2010-02-111.3.3 -> 1.3.4.Gerald Combs1-1/+1
svn path=/trunk/; revision=31865
2010-01-21Remove comment stating that GTK 2.12 is being used since Wireshark 0.99.7.Stephen Fisher1-1/+0
Gerald just changed it from 2.16 to 2.18. svn path=/trunk/; revision=31603
2010-01-21Use the correct GTK_INST_VERSION.Gerald Combs1-1/+1
svn path=/trunk/; revision=31602
2010-01-19Drop our requirement for MSVCR71.DLL.Gerald Combs1-4/+4
svn path=/trunk/; revision=31578
2009-12-23Use the official kfw packages.Gerald Combs1-4/+4
svn path=/trunk/; revision=31355
2009-12-21Switch to using a bundled version of the openSUSE Build Service packagesGerald Combs1-9/+8
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no longer have winposixtype.h, so remove its #includes and add a ssize_t typedef to config.h.win32. svn path=/trunk/; revision=31341
2009-12-18Use the WinPcap version of pcap_datalink_val_to_description if it'sGerald Combs1-0/+2
present. Add an entry for DLT_PPI in case it's not. svn path=/trunk/; revision=31316
2009-12-18Disable PCRE in the Win32 build. GRegex uses a newer version than we doGerald Combs1-1/+1
and this matches the Win64 configuration. svn path=/trunk/; revision=31304
2009-12-17Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installerGerald Combs1-15/+11
build. svn path=/trunk/; revision=31301
2009-12-17Use gtk+-bundle_2.18.5-20091215_win32Anders Broman1-2/+2
svn path=/trunk/; revision=31288
2009-12-16Use gtk+-bundle_2.16.6-20091215_win32Anders Broman1-1/+1
svn path=/trunk/; revision=31285
2009-12-08Fix compilation under Windows. Allocate our hash buffer dynamically soGerald Combs1-1/+2
that _chkstk doesn't throw a hissy fit. When hashing, open the file in binary mode. svn path=/trunk/; revision=31192
2009-11-24Switch back to normal versioning. Bump the version to 1.3.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=31064
2009-11-19Switch from individual GLib, GTK+, and related packages to the all-in-oneGerald Combs1-73/+22
versions. svn path=/trunk/; revision=31023
2009-11-12Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build.Gerald Combs1-2/+2
svn path=/trunk/; revision=30945
2009-11-11Update to the GnuTLS 2.8.5Tomas Kukosa1-1/+1
svn path=/trunk/; revision=30930
2009-11-10Updates for FOP 0.95.Gerald Combs1-1/+4
svn path=/trunk/; revision=30913
2009-11-09Switch the default Fop version to 0.95 and adjust custom_layer_pdf.xslGerald Combs1-1/+1
accordinglty. Tweak the print resolution on all of the images again. Add a MIME type for one of the images. svn path=/trunk/; revision=30909