aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2014-03-04(Trivial) Fix 2 typos; Reformat some long lines.Bill Meier1-6/+6
Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464 Reviewed-on: https://code.wireshark.org/review/491 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-4/+4
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-02Improve windows buildGraham Bloice1-3/+34
Allows config.nmake to pick up settings from environment variables. With the move to git I'm no longer happy with my permanently modified copy of config.nmake, these changes allow the most often modified values to be set from environment variables. As a bonus, some of the variables are set by the vcvarsall.bat for Visual Studio 2012 or later Change-Id: I681aeaec9519f6b6c9fa2c33abc706ce335585f5 Reviewed-on: https://code.wireshark.org/review/70 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-27Make it easier to try GTK 3.6Anders Broman1-2/+6
svn path=/trunk/; revision=54986
2014-01-26Drop support of Visual Studio 2005Alexis La Goutte1-14/+0
* Remove _MSC_VER < 1500 check * Cleanup config.nmake See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html svn path=/trunk/; revision=54965
2014-01-16More Chocolatey lex/yacc updates.Gerald Combs1-3/+3
Add Windows-style path handling to runlex.sh. Update the example Chocolatey LEX path accordingly. This lets us use path information in LEX and have it work in both nmake and runlex.sh Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it. The code is currently untested and commented out. svn path=/trunk/; revision=54828
2014-01-16Allow the use of Win flex-bison and document how to do that.Gerald Combs1-5/+15
svn path=/trunk/; revision=54824
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-0/+7
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-04Add a note and commented-out definitions for Win flex-bison.Gerald Combs1-2/+7
Alex Zhondin was kind enough to create a Chocolatey package for Win flex-bison. Unfortunately a bug in Chocolatey's shell wrapper generator keeps us from using it for the time being. svn path=/trunk/; revision=54584
2013-12-23Back out inadvertant change introduced in SVN #54340Bill Meier1-2/+1
to use GTK2 when building Windows Wireshark. svn path=/trunk/; revision=54390
2013-12-21Add a comment as to a required change to CFLAGSBill Meier1-1/+8
if Wireshark is ever to be built with Gtk >= 3.10. svn path=/trunk/; revision=54340
2013-12-02nmake: Allow setting the wireshark base dir via env variableJörg Mayer1-0/+4
svn path=/trunk/; revision=53718
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer1-3/+3
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
2013-11-07Enable Packet Editor by defaultAlexis La Goutte1-2/+2
svn path=/trunk/; revision=53132
2013-11-05From robionekenobi via ↵Pascal Quantin1-0/+10
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 : Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013 svn path=/trunk/; revision=53095
2013-11-03Pass the name of the sed executable as an explicit argurment toJörg Mayer1-0/+3
runlex.sh (like it is done with LEX already). May fix a problem on Windows with cmake. svn path=/trunk/; revision=53059
2013-10-20From RobiOneKenobi via ↵Pascal Quantin1-3/+33
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 : Add support for MSVC2013 svn path=/trunk/; revision=52716
2013-10-161.11.0 -> 1.11.1Pascal Quantin1-1/+1
svn path=/trunk/; revision=52647
2013-10-12QT_DIR → QT5_BASE_DIR. This matches the CMake environment.Gerald Combs1-12/+12
svn path=/trunk/; revision=52557
2013-10-11Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.Gerald Combs1-0/+10
svn path=/trunk/; revision=52556
2013-10-10Use the right package name.Gerald Combs1-4/+4
svn path=/trunk/; revision=52521
2013-10-10Try to discover Qt similar to the way we discover Python.Gerald Combs1-2/+24
svn path=/trunk/; revision=52520
2013-10-08Add an initial Qt configuration and makefile targets.Gerald Combs1-2/+18
svn path=/trunk/; revision=52456
2013-10-07Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix ↵Anders Broman1-2/+4
build for VS 2012 (MSVC_VARIANT==MSVC2012EE)" svn path=/trunk/; revision=52433
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 06:17:35 +0000