aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2010-10-28From g.khueny via bug 5346:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34673 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-20Target system changed by mistake.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34594 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-20Prepartaions to use GTK 2.22etxrab1-3/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34593 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-05Use the new GTK bundles.etxrab1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34382 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Make "bpf_image" available on Windows. This enables the "Compile BPF" button ↵sake1-0/+2
and "dumpcap -d" on Windows. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34357 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Retry of SVN 34338, now tested on my WinXP dev VM:sake1-0/+2
Use pcap_open_dead instead of pcap_create for the compile BPF button. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34340 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-24Allow up to Python 2.7 now (was 2.6) and move Python build statements into ↵sfisher1-39/+33
same part of nmake file for ease of use. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34246 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Assume we HAVE_GZCLEARERR on Windows and when using cmakemorriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34192 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-16Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().gerald1-0/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26I suspect the changes to config.nmake committed in SVN #33942 were not intended.wmeier1-2/+2
Revert the changes (for now ?) so the Buildbot will run again. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33945 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26Doxygen fixes.etxrab1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33942 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Add ws_load_library and ws_module_open, which respectively callgerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33924 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 ↵morriss1-1/+1
on Win64 too (for consistency more than anything I think). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33923 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps ↵morriss1-1/+1
builds to pick up WinPcap again. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33921 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-05Remove experimental marker from NEW_PACKET_LIST.jake1-4/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33719 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-071.3.6 -> 1.5.0gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33138 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-01From Kovarththanan Rajaratnam via bug 3500:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33036 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Our default target platform is still win32.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32698 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Checking in Stigs changes frometxrab1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32688 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-051.3.5 -> 1.3.6.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32667 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-22Manifests are not needed when building with VC10.wmeier1-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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32540 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-21Add settings for "Microsoft Visual Studio 2010" note thatetxrab1-2/+22
Wireshark does not build with Visual studio 10 yet. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32529 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-09Rename README.win32 to README.windows and add a 64-bit download link.gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32440 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-05Add coment about why 'links' fails if it is used to generate release-notes.txt wmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32387 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-311.3.4 -> 1.3.5.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32345 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-26Update c-ares to 1.7.1.gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32293 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-17Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, andguy1-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). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32230 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-17Use the right #define value to check whether WinPcap hasguy1-0/+1
pcap_free_datalinks(). *Set* that #define, while we're at it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32220 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-24Fix for bug 3926:dimeg1-6/+7
Enhance decoding of TS2 channel list git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31993 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-15Correct GTK+ package for Win64.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31890 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-15Use the latest GTK bundle (2.18.7)etxrab1-5/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31882 f5534014-38df-0310-8fa8-9805f1628bb7
2010-02-111.3.3 -> 1.3.4.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31865 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-21Remove comment stating that GTK 2.12 is being used since Wireshark 0.99.7.sfisher1-1/+0
Gerald just changed it from 2.16 to 2.18. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31603 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-21Use the correct GTK_INST_VERSION.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31602 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-19Drop our requirement for MSVCR71.DLL.gerald1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31578 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-23Use the official kfw packages.gerald1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31355 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-21Switch to using a bundled version of the openSUSE Build Service packagesgerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31341 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-18Use the WinPcap version of pcap_datalink_val_to_description if it'sgerald1-0/+2
present. Add an entry for DLT_PPI in case it's not. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31316 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-18Disable PCRE in the Win32 build. GRegex uses a newer version than we dogerald1-1/+1
and this matches the Win64 configuration. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31304 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-17Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installergerald1-15/+11
build. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31301 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-17Use gtk+-bundle_2.18.5-20091215_win32etxrab1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31288 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-16Use gtk+-bundle_2.16.6-20091215_win32etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31285 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-08Fix compilation under Windows. Allocate our hash buffer dynamically sogerald1-1/+2
that _chkstk doesn't throw a hissy fit. When hashing, open the file in binary mode. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31192 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-24Switch back to normal versioning. Bump the version to 1.3.3.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31064 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-19Switch from individual GLib, GTK+, and related packages to the all-in-onegerald1-73/+22
versions. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31023 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-12Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build.gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30945 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-11Update to the GnuTLS 2.8.5kukosa1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30930 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-10Updates for FOP 0.95.gerald1-1/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30913 f5534014-38df-0310-8fa8-9805f1628bb7
2009-11-09Switch the default Fop version to 0.95 and adjust custom_layer_pdf.xslgerald1-1/+1
accordinglty. Tweak the print resolution on all of the images again. Add a MIME type for one of the images. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30909 f5534014-38df-0310-8fa8-9805f1628bb7
2009-10-29Bump development version.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30750 f5534014-38df-0310-8fa8-9805f1628bb7