aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2012-03-01CVARSDLL hasn't been used (is undefined) for a while....Bill Meier1-2/+2
(This commit should have been part of SVNB #41180). svn path=/trunk/; revision=41254
2012-03-01Update clean_setup list of win32-libs to be deleted.Bill Meier1-8/+10
svn path=/trunk/; revision=41252
2012-02-19Build the TShark taps into a static libcliui library in the ui/cliGuy Harris1-22/+14
directory, and link TShark with that; let's see if this fixes the Windows buildbots. svn path=/trunk/; revision=41070
2012-02-18Create a libui (static) library in the ui directory, which contains theGuy Harris1-19/+52
object files from all the source files in the ui directory (but not in its subdirectories), and link the programs that need it with them. This cleans things up a little bit, and may also fix the Windows build. svn path=/trunk/; revision=41061
2012-02-18Rename the (static) library built from stuff in ui/gtk to "libgtkui" inGuy Harris1-4/+4
automake/autoconf and nmake builds, to match the name in CMake builds. (Forgot Makefile.nmake.) svn path=/trunk/; revision=41059
2012-02-02Revert file commited by mistake.Anders Broman1-2/+2
svn path=/trunk/; revision=40804
2012-02-02Update the protocol name as per commit rev 40801.Anders Broman1-2/+2
svn path=/trunk/; revision=40802
2012-02-01Fix some Windows qmake and Qt Wireshark build issues:Bill Meier1-0/+3
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt; Add '*.pdb' to QMAKE_CLEAN; Fix 'Unescaped backslashes are deprecated' qmake warnings; Remove "debug" message() statements from QtShark.pro. svn path=/trunk/; revision=40797
2012-01-30Rework optional generation of .sbr & .bsc files.Bill Meier1-5/+14
svn path=/trunk/; revision=40779
2012-01-30Rework Windows Wireshark Qt build configuration a bit:Bill Meier1-6/+4
1. Compile and link with (almost exactly) the same options as used when building Windows Wireshark Gtk. The options used allow debugging of the exe using Visual Studio exactly as is done for Wireshark Gtk. Essentially: configure the "release" version to compile and link with symbols. (See ui\qt\QtShark for the details). 2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt which is linked against the "release" Qt libraries. (IOW: don't create a "debug" Makefile). 3. Remove unused variable assignments from config.pri. (They can be added back if needed in the future). svn path=/trunk/; revision=40768
2012-01-30(Trivial) use same "Directory Separator" for dependency and target.Bill Meier1-1/+1
svn path=/trunk/; revision=40767
2012-01-29Part of "Build Browse Information File per default" fromAnders Broman1-2/+4
Kovarththanan Rajaratnam applied. It's still not the default but easier to make it so. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480 svn path=/trunk/; revision=40765
2012-01-24Compile PortAudio if it's available.Gerald Combs1-3/+4
svn path=/trunk/; revision=40708
2012-01-20Add more configuration information to config.pri which lets us removeGerald Combs1-10/+22
more hard-coded definitions from QtShark.pro. Quote an error message to fix a Qt Creator complaint. Add ui\qt\config.pri to the top-level "all" nmake target. Update README.qt. svn path=/trunk/; revision=40607
2012-01-20Try copying our plugins to an accessible directory. This assumes you've setGerald Combs1-0/+12
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment. On Windows, generate a QMake include file (config.pri) from config.nmake. svn path=/trunk/; revision=40600
2012-01-16Another fixup for the move of win32 to ui\win32.Guy Harris1-1/+1
svn path=/trunk/; revision=40539
2012-01-16Make the win32 directory a subdirectory of the ui directory.Guy Harris1-11/+11
svn path=/trunk/; revision=40531
2012-01-15The name of the target for ui/gtk/libui.lib is "gtk", not "ui\gtk".Guy Harris1-1/+1
svn path=/trunk/; revision=40526
2012-01-15cd ../gtk ==> cd ../ui/gtkBill Meier1-1/+1
svn path=/trunk/; revision=40525
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-17/+17
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518
2012-01-06Quote some filename usage.Bill Meier1-4/+4
svn path=/trunk/; revision=40397
2012-01-06Remove support for MSVC < MSVC2005; Update Developer's Guide.Bill Meier1-11/+2
svn path=/trunk/; revision=40395
2011-12-28Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2Gerald Combs1-0/+2
directory. This picks up any DEP/ASLR-related changes. Run peflags on more DLLs. svn path=/trunk/; revision=40317
2011-12-28Add "peflags" to the list of required executables. Use it to make sureGerald Combs1-0/+4
the DLLs we use have DEP and ASLR enabled. svn path=/trunk/; revision=40316
2011-11-17From Pascal Quantin via bug 6593:Gerald Combs1-1/+3
With Subversion 1.7, the working copy metada storage as changed (see http://subversion.apache.org/docs/release-notes/1.7.html#wc-ng for details). As a consequence, the file .svn/entries is no more updated and under Windows the svnversion.h is no more regenerated (unless explicitely removed). The attached patch fixes this issue so as to also check the .svn/wc.db file date in the makefile rule. Note that wc.db file must be checked before entries file as an upgrade of an existing repository from subversion 1.6 to 1.7 leave an old entries file around (that is no more updated). In Makefile.am file, the svnversion.h file generation seems to be systematically forced. So I guess Linux/Mac boxes are not impacted. svn path=/trunk/; revision=39910
2011-11-11Link TShark with gthread.Gerald Combs1-0/+1
svn path=/trunk/; revision=39791
2011-10-05Add a HAVE_GEOIP_V6 configuration option and enable it by default.Gerald Combs1-0/+1
svn path=/trunk/; revision=39283
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERJörg Mayer1-1/+0
as it is the only option left. svn path=/trunk/; revision=39138
2011-08-29Add "--windowsonly" and "--cygwinonly" options to win-setup.shGerald Combs1-2/+2
--appverify. Make sure "mt" is only found in a normaly Windows path and "find" is only found in a Cygwin path. svn path=/trunk/; revision=38781
2011-08-28Install the GUI xml files. I'm not sure about the Makefile.am changes pkease ↵Anders Broman1-0/+2
check. svn path=/trunk/; revision=38756
2011-08-15Add libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDBGerald Combs1-9/+13
archive. Add libwsutil.pdb and sort a few items while we're here. svn path=/trunk/; revision=38551
2011-08-11Add "distclean" and "maintainer-clean" rules to the docbook directoryGuy Harris1-0/+11
Makefile.nmake. Have "clean", "distclean", and "maintainer-clean" in the top-level Makefile.nmake file clean out the docbook directory. Add a "docbook" target to the top-level Makefile.nmake file. svn path=/trunk/; revision=38468
2011-08-10Add some distclean / clean targets.Gerald Combs1-1/+1
svn path=/trunk/; revision=38457
2011-07-19Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmakeGerald Combs1-24/+24
use WIRESHARK_LIB_DIR for the location of our external libraries. svn path=/trunk/; revision=38119
2011-07-14On Windows enable threads everywhere instead of just in dumpcap. IfGerald Combs1-0/+1
threads are enabled use them to check the recent file list. Fixes bug 3810. svn path=/trunk/; revision=38033
2011-06-27Use the latest libsmi package. Note that we now support OID resolutionGerald Combs1-3/+9
on 64-bit Windows. svn path=/trunk/; revision=37808
2011-06-23Remove old PCRE references from the Windows build environment. We're notGerald Combs1-19/+3
likely to add it back to wireshark-win32-libs and it was never available in wireshark-win64-libs. svn path=/trunk/; revision=37778
2011-06-17Set PCAP_NG_DEFAULT correct in config.h on win32.Stig Bjørlykke1-0/+1
svn path=/trunk/; revision=37697
2011-05-24Move the Windows argument list conversion code to a common routine.Gerald Combs1-6/+6
svn path=/trunk/; revision=37372
2011-05-19Update the User's Guide.Gerald Combs1-1/+1
svn path=/trunk/; revision=37312
2011-05-19From Dirk Jagdmann via bug 5875:Gerald Combs1-0/+1
My attachment adds a link to a XSLT file to the preamble of the PDML. The XSLT will transform the PDML to a HTML page, and the HTML page features a look similar to Wireshark. See http://cubic.org/~doj/ebay/a.pdml for an example. The patch also contains a small perl program which converts the Wireshark colortable into javascript code which is used in the XSLT file. If you want to use a different color scheme you would execute the perl program and insert the generated javascript function into your XSLT file. To view the HTML you could either place the PDML and XSLT file on your webserver and verify that your webserver sends the PDML file as "text/xml". Then your webbrowser will find the linked XSLT file, download that as well and convert the PDML to HTML on the fly. You could also use an XSLT processor like xsltproc to convert the PDML and XSLT into a static HTML file. From me: Minor fixups. svn path=/trunk/; revision=37298
2011-05-12WANT_PACKET_EDITOR fixups for Windows.Chris Maynard1-0/+1
svn path=/trunk/; revision=37091
2011-05-12Make the use of UIManager a configure option.Anders Broman1-0/+1
NOTE Only for Windows. Additional moves to UIManager. svn path=/trunk/; revision=37072
2011-04-29Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.Jeff Morriss1-1/+0
svn path=/trunk/; revision=36956
2011-04-13Build win64 with a modified zlib (google is your friend).Anders Broman1-2/+2
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0 First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51: set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning. svn path=/trunk/; revision=36616
2011-04-12Build with zlib-1.2.5 for win32Anders Broman1-2/+12
zlib for GTK hasd this comment: /* LFS conventions have no meaning on Windows. Looking for feature * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is * wrong. So make sure any such macros misguidedly defined by the * user have no effect. Windows has large file support, but the * official zlib DLL has not been built to provide the 64-bit offset * APIs, sigh. So we have just patched out the 64-bit offset API * from this header file. */ svn path=/trunk/; revision=36586
2011-04-05Use the latest library tag, which updates GNUTLS. Add code to check forGerald Combs1-0/+6
libintl-8.dll and add the GNUTLS version if needed. svn path=/trunk/; revision=36483
2011-03-08Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer ↵Bill Meier1-1/+0
supports the old packet list) svn path=/trunk/; revision=36165
2011-02-25Comments have to be at the beginning of the line.Gerald Combs1-1/+1
svn path=/trunk/; revision=36072
2011-02-25Verify tools fails if wireshark-win32-libs does not exist.Anders Broman1-0/+2
svn path=/trunk/; revision=36069
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 10:57:07 +0000