aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
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
2011-02-17Apparently, if the argument to the cd command in an nmake file containsGuy Harris1-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. svn path=/trunk/; revision=35987
2011-02-02A bit of Windows makefiles rework and cleanup:Bill Meier1-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 ... svn path=/trunk/; revision=35747
2011-01-16Compile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;Bill Meier1-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. svn path=/trunk/; revision=35564
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 toGerald Combs1-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. svn path=/trunk/; revision=35411
2011-01-04Drop Python dissectors directory flag from programs that don't have dissectors.Jaap Keuter1-3/+2
Win32: remove superfluous dumpcap build dependancy on wiretap. svn path=/trunk/; revision=35365
2011-01-04Free dumpcap from linking to wiretap.Jaap Keuter1-2/+2
svn path=/trunk/; revision=35353
2010-11-26Move native Win32 code to its own directory and out of gtk directory ↵Stephen Fisher1-3/+16
(hopefully without breaking any builds) svn path=/trunk/; revision=35032
2010-11-22Prevent "MS-DOS style path detected" messages for several commands (when ↵Bill Meier1-4/+4
"nodosfilewarning" not set). svn path=/trunk/; revision=35006
2010-10-11Use the latest User's Guide.Gerald Combs1-1/+1
svn path=/trunk/; revision=34470
2010-10-05It seems it's quite hard to set and retrieve environment variables in nmake ↵Jeff 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. svn path=/trunk/; revision=34381
2010-10-04Try to make r34375 work every timeStephen Fisher1-1/+1
svn path=/trunk/; revision=34378
2010-10-04Use spaces instead of tabs on two lines added in r34375Stephen Fisher1-2/+2
svn path=/trunk/; revision=34377
2010-10-04Stop the MS-DOS style path name warnings when compiling on Windows.Stephen Fisher1-40/+43
svn path=/trunk/; revision=34375
2010-10-04Don't remove the services file. It isn't built in the same way thatGerald Combs1-1/+1
sminmpec.c is. svn path=/trunk/; revision=34373
2010-10-04Copy make-sminmpec.pl to make-services.pl and modify it to fetch theGerald Combs1-1/+3
IANA port-numbers file and save it to "services". Use it to update "services". svn path=/trunk/; revision=34371
2010-10-03Make "bpf_image" available on Windows. This enables the "Compile BPF" button ↵Sake Blok1-0/+1
and "dumpcap -d" on Windows. svn path=/trunk/; revision=34357
2010-10-03Retry of SVN 34338, now tested on my WinXP dev VM:Sake Blok1-0/+1
Use pcap_open_dead instead of pcap_create for the compile BPF button. svn path=/trunk/; revision=34340
2010-09-23Assume we HAVE_GZCLEARERR on Windows and when using cmakeJeff Morriss1-0/+1
svn path=/trunk/; revision=34192
2010-09-15Revert 34081 and 34093 in preparation for a cleaner fix.Jeff Morriss1-20/+20
svn path=/trunk/; revision=34121
2010-09-10From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :Jeff 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. svn path=/trunk/; revision=34093
2010-09-08Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :Jeff Morriss1-1/+1
Move libwsutil forward in the list of Wireshark libraries so that our inet_pton is always used. svn path=/trunk/; revision=34081
2010-07-15capinfos.c includes gcrypt.h, so it needs the GNU TLS flags.Guy Harris1-2/+3
svn path=/trunk/; revision=33536
2010-07-15There shouldn't be any need to build stuff in the top-level directoryGuy Harris1-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. svn path=/trunk/; revision=33534
2010-07-15No need to link dumpcap with libgnutls.Guy Harris1-1/+0
svn path=/trunk/; revision=33533
2010-07-06Add a target which creates a zip file containing our .pdb files.Gerald Combs1-0/+6
svn path=/trunk/; revision=33460
2010-06-01From Kovarththanan Rajaratnam via bug 3500:Gerald Combs1-2/+13
Sébastien's initial commit [1] didn't contain support for embedding Python on Windows. [1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529 From me: Comment out PYTHON_EMBED for now. Start a list of known Python+CRT versions. Add get_wspython_dir to libwireshark.def. svn path=/trunk/; revision=33036
2010-05-28Move some code (including the optional objects) into libwsutilJeff Morriss1-32/+26
svn path=/trunk/; revision=33012
2010-04-22Manifests are not needed when building with VC10.Bill Meier1-13/+13
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10. See: http://msdn.microsoft.com/en-us/library/dd293574.aspx svn path=/trunk/; revision=32540
2010-04-18(Trivial) Escape a '?' in an error message.Bill Meier1-1/+1
svn path=/trunk/; revision=32504
2010-04-09Rename README.win32 to README.windows and add a 64-bit download link.Gerald Combs1-7/+5
Add tools/textify.sh, which makes a Notepad-clickable copy of a text file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt. Remove tools/unix2dos.pl and use Cygwin's u2d instead. svn path=/trunk/; revision=32440
2010-03-26Update c-ares to 1.7.1.Gerald Combs1-0/+1
svn path=/trunk/; revision=32293
2010-03-17Use the right #define value to check whether WinPcap hasGuy Harris1-0/+1
pcap_free_datalinks(). *Set* that #define, while we're at it. svn path=/trunk/; revision=32220
2010-03-04Include inet_pton.obj when building TShark, as we now need it.Guy Harris1-2/+2
(But it built on the Win64 buildbot; did Microsoft add it in later releases? If so, should we include it only if it's needed?) svn path=/trunk/; revision=32107
2010-02-21Enable command-line wildcard expansion when invoking mergecap and capinfosBill Meier1-2/+4
by linking those executables with setargv.obj. See http://www.wireshark.org/lists/wireshark-users/201002/msg00194.html (and preceeding messages in the thread). svn path=/trunk/; revision=31943
2010-02-15Use the latest GTK bundle (2.18.7)Anders Broman1-1/+1
svn path=/trunk/; revision=31882
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 08:48:41 +0000