Commit Graph

5 Commits

Author SHA1 Message Date
Graham Bloice 528a857258 Fix CMake generation and use of Windows .rc files
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.

The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake.  The path is removed for nmake builds.

Updated build architecture detection, required for wireshark.manifest.in

Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 20:22:32 +00:00
Pascal Quantin b1bea543d9 Introduce end-of-line normalization
Change-Id: Ie6991af2432b193fbdc23bbbd335f83c091f14e8
Reviewed-on: https://code.wireshark.org/review/114
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-05 22:28:01 +00:00
Jaap Keuter b704bdcbc5 Remove the pre-release flag from FILEFLAGS in the resource file.
svn path=/trunk/; revision=24757
2008-03-29 23:04:33 +00:00
Gerald Combs 7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Ulf Lamping 872f29e293 from Gerhard Gappmeier (ULFL: only slightly changed the unused prevention):
I updated the files for the build process to fit the current wireshark
version.
I don't know much about it so a just copied the missing parts from
another module.
I'm not sure of it's right, so please have a look at it.

Modifications:
* added plugin.rc.in
* added moduleinfo.nmake
* updated Makefile.am/nmake/common
* removed unused variable from opcua_application_layer.c
* fixed unused parameter warning in opcua.c

I tested it on Windows with VC6 and on Gentoo linux with gcc 3.4.6.

svn path=/trunk/; revision=21802
2007-05-16 08:13:11 +00:00