aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2013-08-28Revert file committed by accidentPascal Quantin1-5/+5
svn path=/trunk/; revision=51565
2013-08-28Fix copy/paste error introduced in r51541 and spotted by JoergPascal Quantin1-5/+5
svn path=/trunk/; revision=51564
2013-08-23Chocolatey wants to install NSIS in "c:\Program Files" no matter what. TryGerald Combs1-4/+16
to locate makensis automatically, similar to the way we locate Python. svn path=/trunk/; revision=51497
2013-07-24we have to make the manual change for *gtk2* nowMartin Kaiser1-1/+1
svn path=/trunk/; revision=50873
2013-07-24Don't enable GTK3 build on win32 - it's not working.Anders Broman1-1/+1
svn path=/trunk/; revision=50868
2013-07-24Make it possible to use GetProcessMemoryInfo on Windows.Anders Broman1-2/+7
svn path=/trunk/; revision=50865
2013-07-24Change default gtk build from version 2 to version 3 forJörg Mayer1-1/+1
autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
2013-07-20GeoIP 1.5.1.Gerald Combs1-2/+2
svn path=/trunk/; revision=50742
2013-06-01Change a forward-slash to a back-slash as the path separator..Chris Maynard1-1/+1
svn path=/trunk/; revision=49677
2013-04-23Add a link to the latest CRT redistributables.Gerald Combs1-0/+2
svn path=/trunk/; revision=49000
2013-04-221.9.3 → 1.11.0.Gerald Combs1-2/+2
svn path=/trunk/; revision=48972
2013-03-281.9.2 → 1.9.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=48627
2013-03-181.9.1 → 1.9.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=48406
2013-03-15Get release note conversion working on Windows.Gerald Combs1-2/+5
svn path=/trunk/; revision=48321
2013-03-15Switch to Asciidoc for the release notes. The initial conversion fromGerald Combs1-1/+2
Docbook was done using Pandoc and cleaned up by hand. Add an asciidoc.conf which contains macros for linking to Wireshark bugs and CVE IDs. Remove the release-notes.chm target. I don't think we ever used it and we're probably better off generating PDF or HTML if we need something fancier than plain text. In configure.ac, consolidate program path discovery a bit and add a2x discovery. svn path=/trunk/; revision=48307
2013-03-09Switch to WinPcap 4.1.3.Gerald Combs1-2/+4
svn path=/trunk/; revision=48207
2013-03-08Switch to c-ares 1.9.1.Gerald Combs1-2/+2
svn path=/trunk/; revision=48191
2013-03-06Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, ↵Bill Meier1-7/+9
GTK_DISABLE_DEPRECATED Also: remove "experimental" comment from Win32 GTK3 build config; (I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental). svn path=/trunk/; revision=48145
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+0
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-20More 1.9.0 → 1.9.1 changes. Release note updates.Gerald Combs1-1/+1
svn path=/trunk/; revision=47777
2013-02-19Enable automatic updates for Win64. Fix a copy/paste error.Gerald Combs1-0/+7
svn path=/trunk/; revision=47749
2013-02-19Add automatic software update checks for Win32 using WinSparkle. AddGerald Combs1-0/+19
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-02-07Add note re 'no problems to date' with VS2012 (VC11).Bill Meier1-0/+2
svn path=/trunk/; revision=47539
2012-12-28Fixes & comments for building Wireshark with VS2012 (VC11)Bill Meier1-4/+21
1. Define 'APPVER' appropriately; Prevents warning message: LINK : warning LNK4010: invalid subsystem version number 5.0; default subsystem version assumed. 2. Add comment (& ToDo) re using VS2012 to build .exe which will also run on WIndows XP. svn path=/trunk/; revision=46830
2012-12-22Define GTK_SCHEMAS_DIRAnders Broman1-1/+1
svn path=/trunk/; revision=46704
2012-12-22Put back the 'right' GTK3 bundlesAnders Broman1-4/+2
svn path=/trunk/; revision=46703
2012-12-21Remove redundant (commented out) definition for GTK_PKGBill Meier1-1/+0
(introduced by me in SVN #46612). svn path=/trunk/; revision=46677
2012-12-19Don't yse the new GTK3 bundle, it lacks the toolsAnders Broman1-4/+4
svn path=/trunk/; revision=46614
2012-12-19Use the new bundleAnders Broman1-6/+6
svn path=/trunk/; revision=46613
2012-12-19Let's try using the new Win32 GTK2 bundle 2.24.14 (as suggested by Anders).Bill Meier1-1/+2
svn path=/trunk/; revision=46612
2012-12-18- Make dumpcap build with the new bundle.Anders Broman1-1/+1
- Use the correct bundle id for GTK3 svn path=/trunk/; revision=46586
2012-12-18Prepare to ubdate the GTK bundlesAnders Broman1-8/+7
svn path=/trunk/; revision=46585
2012-11-13vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines theJeff Morriss1-4/+6
variable for it. Since it's always defined but it's optional, don't check for its existence. svn path=/trunk/; revision=46022
2012-10-19The U3 and PortableApps packaging processes depend on simpleGerald Combs1-5/+14
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-16- Use PROGRAM_NAME in the unistaller too.Anders Broman1-2/+8
- Make it possible to set PROGRAM_NAME in environment. - Update the comment about setting program name it *should* work now. svn path=/trunk/; revision=45582
2012-10-15Start making the program name "wireshark" configurable.Anders Broman1-1/+5
svn path=/trunk/; revision=45558
2012-10-15Typos.Anders Broman1-2/+2
svn path=/trunk/; revision=45557
2012-10-15Building with GTK3 works.Anders Broman1-1/+1
svn path=/trunk/; revision=45555
2012-10-15Build GTK2 versions again.Anders Broman1-1/+1
svn path=/trunk/; revision=45554
2012-10-15Try a experimental gtk3 buildAnders Broman1-1/+1
svn path=/trunk/; revision=45551
2012-10-14Revert back to GTK2Anders Broman1-1/+1
svn path=/trunk/; revision=45541
2012-10-14Try a experimental gtk3 buildAnders Broman1-2/+10
svn path=/trunk/; revision=45540
2012-10-04Expand comments about the "making the C runtime available to Wireshark"Guy Harris1-6/+66
stuff. svn path=/trunk/; revision=45305
2012-10-01Stop defining HAVE_CONFIG_H on Windows builds too.Jeff Morriss1-1/+1
svn path=/trunk/; revision=45231
2012-09-25Revert 45116. Developer's probably don't want the user-guide.chm that they ↵Chris Maynard1-5/+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/+5
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-24Look in $(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) forGerald Combs1-3/+13
the MSVC redistributable package, then look in the top-level $(WIRESHARK_LIB_DIR). This lets us more easily use multiple compilers with the same library directory. svn path=/trunk/; revision=45113
2012-09-21Add MCVC2012 ProfessionalAnders Broman1-0/+4
svn path=/trunk/; revision=45036
2012-09-21Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back offJeff Morriss1-1/+1
the compile line when building with cmake. Put _U_'s definition in config.h when building with autofoo and on Windows. svn path=/trunk/; revision=45034
2012-09-20Add some info about building with Visual Studio 2012 (VC11):Bill Meier1-1/+8
Summary: It seems to work; win32.mak file must be obtained from <somewhere>; (See comment in file for details) svn path=/trunk/; revision=45033