aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2011-11-17From Pascal Quantin via bug 6593:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39910 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-11Link TShark with gthread.gerald1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39791 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-05Add a HAVE_GEOIP_V6 configuration option and enable it by default.gerald1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39283 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERjmayer1-1/+0
as it is the only option left. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39138 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-29Add "--windowsonly" and "--cygwinonly" options to win-setup.shgerald1-2/+2
--appverify. Make sure "mt" is only found in a normaly Windows path and "find" is only found in a Cygwin path. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38781 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28Install the GUI xml files. I'm not sure about the Makefile.am changes pkease ↵etxrab1-0/+2
check. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-15Add libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDBgerald1-9/+13
archive. Add libwsutil.pdb and sort a few items while we're here. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38551 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-11Add "distclean" and "maintainer-clean" rules to the docbook directoryguy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38468 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-10Add some distclean / clean targets.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38457 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-19Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmakegerald1-24/+24
use WIRESHARK_LIB_DIR for the location of our external libraries. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38119 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-14On Windows enable threads everywhere instead of just in dumpcap. Ifgerald1-0/+1
threads are enabled use them to check the recent file list. Fixes bug 3810. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38033 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27Use the latest libsmi package. Note that we now support OID resolutiongerald1-3/+9
on 64-bit Windows. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37808 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-23Remove old PCRE references from the Windows build environment. We're notgerald1-19/+3
likely to add it back to wireshark-win32-libs and it was never available in wireshark-win64-libs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37778 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-17Set PCAP_NG_DEFAULT correct in config.h on win32.stig1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37697 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24Move the Windows argument list conversion code to a common routine.gerald1-6/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37372 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19Update the User's Guide.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37312 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19From Dirk Jagdmann via bug 5875:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37298 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-12WANT_PACKET_EDITOR fixups for Windows.cmaynard1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37091 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-12Make the use of UIManager a configure option.etxrab1-0/+1
NOTE Only for Windows. Additional moves to UIManager. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37072 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-29Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.morriss1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36956 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Build win64 with a modified zlib (google is your friend).etxrab1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36616 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-12Build with zlib-1.2.5 for win32etxrab1-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. */ git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36586 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-05Use the latest library tag, which updates GNUTLS. Add code to check forgerald1-0/+6
libintl-8.dll and add the GNUTLS version if needed. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36483 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-08Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer ↵wmeier1-1/+0
supports the old packet list) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36165 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-25Comments have to be at the beginning of the line.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36072 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-25Verify tools fails if wireshark-win32-libs does not exist.etxrab1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36069 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-17Apparently, if the argument to the cd command in an nmake file containsguy1-1/+1
spaces, it needs to be quoted, the fact that, if the argument to a cd command typed at cmd.exe contains spaces, it *doesn't* need to be quoted nonwithstanding. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35987 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-02A bit of Windows makefiles rework and cleanup:wmeier1-12/+8
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35747 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-16Compile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;wmeier1-14/+1
(Treat warnings as errors); Done by simplifing the dependency line for the objects so that the default .c.obj inference rule is used. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35564 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 togerald1-6/+6
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8 instead of utf_16to8. This should fix bug 5520. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35411 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-04Drop Python dissectors directory flag from programs that don't have dissectors.jake1-3/+2
Win32: remove superfluous dumpcap build dependancy on wiretap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35365 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-04Free dumpcap from linking to wiretap.jake1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35353 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-26Move native Win32 code to its own directory and out of gtk directory ↵sfisher1-3/+16
(hopefully without breaking any builds) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35032 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-22Prevent "MS-DOS style path detected" messages for several commands (when ↵wmeier1-4/+4
"nodosfilewarning" not set). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35006 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-11Use the latest User's Guide.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34470 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-05It seems it's quite hard to set and retrieve environment variables in nmake ↵morriss1-2/+1
(at least I can't figure it out). So, just cd back to MAKEDIR after cleaning up. This should get the buildbots going again and fix bug 5275. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34381 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Try to make r34375 work every timesfisher1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34378 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Use spaces instead of tabs on two lines added in r34375sfisher1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34377 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Stop the MS-DOS style path name warnings when compiling on Windows.sfisher1-40/+43
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34375 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Don't remove the services file. It isn't built in the same way thatgerald1-1/+1
sminmpec.c is. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34373 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Copy make-sminmpec.pl to make-services.pl and modify it to fetch thegerald1-1/+3
IANA port-numbers file and save it to "services". Use it to update "services". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34371 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Make "bpf_image" available on Windows. This enables the "Compile BPF" button ↵sake1-0/+1
and "dumpcap -d" on Windows. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34357 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Retry of SVN 34338, now tested on my WinXP dev VM:sake1-0/+1
Use pcap_open_dead instead of pcap_create for the compile BPF button. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34340 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Assume we HAVE_GZCLEARERR on Windows and when using cmakemorriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34192 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-15Revert 34081 and 34093 in preparation for a cleaner fix.morriss1-20/+20
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34121 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-10From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :morriss1-19/+19
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton is always linked in before wsock32's. This means that our Windows-7 Win64 builds (on which there is a native inet_pton in wsock32) will still work on pre-Vista Win64's. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34093 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-08Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :morriss1-1/+1
Move libwsutil forward in the list of Wireshark libraries so that our inet_pton is always used. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34081 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15capinfos.c includes gcrypt.h, so it needs the GNU TLS flags.guy1-2/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33536 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15There shouldn't be any need to build stuff in the top-level directoryguy1-5/+3
with the Lua or libgnutls flags, as nothing in the top-level directory should use them directly. However, libwireshark *does* require the Lua flags, so use them. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33534 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15No need to link dumpcap with libgnutls.guy1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33533 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 14:17:01 +0000