summaryrefslogtreecommitdiff
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2015-10-141.12.8 → 1.12.9.Gerald Combs1-1/+1
Change-Id: Ida58dbef0bdca8149f9825ebf2e99e279ebd0b09 Reviewed-on: https://code.wireshark.org/review/11045 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-13[config.nmake] Also look for Chocolatey install of PythonBill Meier1-1/+4
Change-Id: I0b7077b21da361070518becc50cd0ca521110494 Reviewed-on: https://code.wireshark.org/review/10021 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-121.12.7 → 1.12.8.Gerald Combs1-1/+1
Change-Id: Ia337e5792d62873e6ae459e28c9b353d8bb119b9 Reviewed-on: https://code.wireshark.org/review/10002 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-171.12.6 → 1.12.7.Gerald Combs1-1/+1
Change-Id: Ia910cc3d4d89d5ec2213dccaf98c95730b6c34ec Reviewed-on: https://code.wireshark.org/review/8960 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-121.12.5 → 1.12.6.Gerald Combs1-1/+1
Change-Id: Id450c1ec647ea6cb0f9d5a6e1c376eb62bd05067 Reviewed-on: https://code.wireshark.org/review/8438 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-09MSVC: Fix opting out of librariesOrgad Shaneh1-16/+0
When *_DIR variables are defined (even if empty), nmake tries to build them and fails. Don't set them at all if not configured to. Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 (cherry picked from commit 734e4083c9bd18a15451691ee5967f14a4c4019d) Reviewed-on: https://code.wireshark.org/review/6360 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-041.12.4 → 1.12.5Gerald Combs1-1/+1
Change-Id: I3d7907247f9bc14e3104aa9cb98f588967953d1b Reviewed-on: https://code.wireshark.org/review/7529 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18Fix Lua dll for Visual Studio 2013Graham Bloice1-2/+6
The Lua dll is different for each version of Visual Studio, the VS2013 variant was not specified. Change-Id: Ic41b61b19befb3c33e9bc4c188c80cf585113fde Reviewed-on: https://code.wireshark.org/review/6601 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-071.12.3 → 1.12.4.Gerald Combs1-1/+1
Change-Id: I57e5b7a2294077167616ff24bed0e772d455f9d4 Reviewed-on: https://code.wireshark.org/review/6383 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-121.12.2 → 1.12.3.Gerald Combs1-1/+1
Change-Id: I7770b51dbb40c405db395463ceef5c46ae28be73 Reviewed-on: https://code.wireshark.org/review/5259 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 packagePascal Quantin1-2/+2
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: Icc3afc00fa38e4c6937147497bfb913dd50f1333 Reviewed-on: https://code.wireshark.org/review/4404 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-161.12.1 → 1.12.2.Gerald Combs1-1/+1
Change-Id: If6c86cdc23a766667e987321a9bce44bb860006f Reviewed-on: https://code.wireshark.org/review/4131 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-311.12.0 → 1.12.1.Gerald Combs1-1/+1
Change-Id: I059be7c092f52f5f7d3a29357abd8c9b05204905 Reviewed-on: https://code.wireshark.org/review/3306 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-08Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-5/+13
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from ad7b5381ac54567217f12ee729c7be6cd2848d0f) Change-Id: I3f67b80e984e187ed65c0997fcd02ae3d715995b Reviewed-on: https://code.wireshark.org/review/2021 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-07Use -O2 option when compiling with MSVCPascal Quantin1-1/+12
Change-Id: I1b7e3c94de13e44ee46d5f8abcb70b5ed6af7051 Reviewed-on: https://code.wireshark.org/review/1984 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-23Initialize master-1.12.Gerald Combs1-6/+6
Change-Id: Idc679d0c7f13934fceb4d196d76abdefc51f4450 (cherry picked from commit 543ff5713546c82f9bc44af3198136501593e09f) Reviewed-on: https://code.wireshark.org/review/1760 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-16Build with GTK+ 2.24.23.Gerald Combs1-11/+32
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-14Add a comment indicating that 'PLATFORM' is apparently set only for X64.Bill Meier1-1/+2
Change-Id: I5248c421e53a4347789c076433af004697a1b682 Reviewed-on: https://code.wireshark.org/review/1637 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12Add default paths for the Qt online installer for Windows.Gerald Combs1-0/+7
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543 Reviewed-on: https://code.wireshark.org/review/1618 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-01Add a comment re VS2013EE requiring that win32.mak needs to be separately ↵Bill Meier1-6/+15
obtained. Change-Id: I53413f7bdde50149fd923bbe35c995145d5139f2 Reviewed-on: https://code.wireshark.org/review/1458 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-17Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012Pascal Quantin1-0/+8
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f Reviewed-on: https://code.wireshark.org/review/1176 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-09Switch back Windows 32 bits build to GTK2Pascal Quantin1-2/+2
GTK3 does not work great on Windows: - the GUI is quite ugly - features like background color in filter box does not work - x64 builds are still using GTK2 - no one is putting efforts on this to fix those issues As we are transitioning to Qt, I do not expect any improvement soon. Let's switch back to a more user friendly GUI. Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a Reviewed-on: https://code.wireshark.org/review/1026 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-07Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW ↵Pascal Quantin1-2/+2
gcc 4.3 Fixes bug 9957 Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6 Reviewed-on: https://code.wireshark.org/review/991 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05Upgrade Windows builds to Lua 5.2.3Pascal Quantin1-4/+4
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0 Reviewed-on: https://code.wireshark.org/review/974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-5/+5
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-01 04:57:25 +0000