aboutsummaryrefslogtreecommitdiffstats
path: root/image/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2015-01-11Fix CMake generation and use of Windows .rc filesGraham Bloice1-0/+11
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>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-0/+1
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-04Rip out the filetap codeEvan Huus1-6/+1
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@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-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-1/+11
(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
2013-12-13Try to fix building of captypeAnders Broman1-1/+6
svn path=/trunk/; revision=54024
2013-11-01Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 :Pascal Quantin1-3/+3
Update manifest file so as to identify Windows 8.1 properly (see http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx for details) Use manifest file to build tshark, rawshark and dumpcap svn path=/trunk/; revision=53024
2012-09-24Add reordercap to this makefile too.Martin Mathieson1-1/+6
svn path=/trunk/; revision=45094
2011-01-28Use the correct processor architecture in our manifest. This lets usGerald Combs1-0/+1
create a usable wireshark.exe for x64 using Visual C++ 10. Change the name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately reflect what it's used for. Allow MSVC_VARIANT to be set from the system environment, mainly to keep me from accidentally clobbering it in the future. svn path=/trunk/; revision=35687
2008-05-20Create a new "Wireshark utility" library and move the mpeg-audio stuff fromJeff Morriss1-1/+6
wiretap to this new libwsutil. This solves http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark no longer depend on libwiretap. svn path=/trunk/; revision=25330
2008-04-13fixes related to file_dlg_win32.rcUlf Lamping1-1/+1
svn path=/trunk/; revision=24976
2008-02-15Add rawshark, a utility that, when given raw pcap-formatted packets andGerald Combs1-1/+6
a list of fields, prints the field values found in each packet. Packet data can be specified as a libpcap DLT, e.g. "EN10MB" or an upper-layer protocol, e.g. "http". svn path=/trunk/; revision=24339
2006-09-12add a comment, that .res files are generated using an implicit (built in) ↵Ulf Lamping1-0/+2
nmake rule svn path=/trunk/; revision=19200
2006-05-31Fix manifest name.Gerald Combs1-2/+2
svn path=/trunk/; revision=18285
2006-05-31ethereal.rc -> wireshark.rcGerald Combs1-3/+3
svn path=/trunk/; revision=18283
2006-05-31Tethereal/tethereal -> TShark/tshark.Gerald Combs1-3/+3
svn path=/trunk/; revision=18268
2006-05-31libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ ofGerald Combs1-3/+3
changes here. It compiles OK on OS X, but hasn't been tested anywhere else. svn path=/trunk/; revision=18260
2006-05-23Make it compile again.Anders Broman1-2/+2
svn path=/trunk/; revision=18210
2006-05-22ethereal->wireshark updatesRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18206
2006-02-18add a missing dependency to ethereal.rcUlf Lamping1-1/+1
svn path=/trunk/; revision=17345
2006-02-14Split the version under Windows into its major, minor, and microGerald Combs1-2/+3
components. Use them to build the VERSION, RC_VERSION, and manifest versions (the latter two are picky about formatting). This would probably be useful on the autoconf side, but I didn't see an obvious way to implement it. svn path=/trunk/; revision=17302
2006-02-13Add a manifest, so that styled widgets are drawn correcltly. TheGerald Combs1-2/+7
"version" field in the manifest is picky about formatting, so setting a custom version in config.nmake (e.g. "0.10.14-test") will probably break the Windows build. svn path=/trunk/; revision=17291
2005-11-28first steps towards a separated capture tool, working title "dumpcap"Ulf Lamping1-1/+6
personal backup only, not meant for public testing! I've copied main.c into dumpcap.c and carved out all things not needed currently won't work as a command line tool, capture_loop.c wants an input pipe console output is also very ugly and the whole code needs a lot of further cleanup shouldn't break the unix build as I've only changed the nmake files so far, but who knows ... svn path=/trunk/; revision=16615
2005-02-14Make the "maintainer-clean" rules get rid of some additional generatedGuy Harris1-0/+2
files. Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and GENERATED_FILES macros in Makefile.common files, along the lines of what wiretap/Makefile.common has. Clean up "*~" files with "make clean" rather than only "make distclean" in some additional places. Add "maintainer-clean" rules to the Makefile.nmake files, paralelling the ones in the automake-generated Makefile.in files, using the GENERATED_FILES macros from Makefile.common files. In some cases, move the cleanup of files from "make distclean" to "make maintainer-clean", and in other cases, put in a comment indicating why we're not doing that (because some files that are distributed in the source tarballs, namely Flex output, were built with a UN*X Flex and won't compile on Windows, so we get rid of them with "make distclean" so you can clean up stuff that *has* to be re-generated for Windows). Clean up some *CLEANFILES definitions - get rid of ones that no longer apply as files were moved or that add to the definition a name that's already there. svn path=/trunk/; revision=13402
2004-10-20renamed capinfo to capinfos, as the former name capinfo was already used in ↵Ulf Lamping1-3/+3
a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed. svn path=/trunk/; revision=12358
2004-07-28Add the MSWIN RC information for capinfo.Olivier Biot1-1/+6
svn path=/trunk/; revision=11556
2004-07-23From Graham Bloice: add resources to wiretap.dll.Guy Harris1-1/+6
svn path=/trunk/; revision=11476
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-17From Graham Bloice: add resource information to libethereal.dll.Guy Harris1-1/+6
svn path=/trunk/; revision=11388
2003-10-10Give every Makefile.nmake file a "distclean" rule, and have "distclean"Guy Harris1-1/+3
recurse into subdirectories doing "nmake -f Makefile.nmake distclean". Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean" doesn't remove (such as Flex/Bison output and config.h files) - and have "nmake -f Makefile.nmake distclean" remove stuff that "make distclean" removes, including "tethereal-tap-register.c" and "ethereal-tap-register.c". svn path=/trunk/; revision=8672
2003-03-26From Graham Bloice: make the RC_VERSION variable in config.nmakeGuy Harris1-6/+6
comma-separated, so that the resources will be built correctly and the version number correctly displayed in the GUI, and make the resources dependent on "config.nmake" so that they're rebuilt if it's changed. svn path=/trunk/; revision=7373
2001-07-12From Edward Meaney: include "mergecap.rc" in the list of things to beGuy Harris1-2/+2
built. svn path=/trunk/; revision=3703
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-1/+6
svn path=/trunk/; revision=3701
2001-05-21Add resource stuff for text2pcap.Guy Harris1-2/+7
svn path=/trunk/; revision=3429
2001-04-05Use sed in the Win32 build to place the version in various files.Gilbert Ramirez1-0/+26
We us $(VERSION), defined in the top-level config.nmake, to replace @VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are similarly used. svn path=/trunk/; revision=3258
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 02:33:41 +0000