aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2003-06-25OK, try bringing back the #undef, now that we know how to escape the #.Guy Harris1-2/+2
svn path=/trunk/; revision=7927
2003-06-24Properly escape the '#' character in the HAVE_GNU_ADNS definition.Gerald Combs1-2/+3
svn path=/trunk/; revision=7924
2003-06-17Handle the 1.3 vs. 2.x issue similarly to the way Lars Roland's patchesGuy Harris1-30/+30
did, basing the path name structure on the version number, but handle GLib and GTK+ orthogonally. svn path=/trunk/; revision=7896
2003-06-17From Lars Roland:Guy Harris1-5/+7
fix typo in my earlier checkin - GTK_GLIB_DIR should be GLIB_GTK_DIR; look for headers in "lib\glib-$(GLIB_VERSION)\include and "lib\gtk-$(GTK_VERSION)\include, as that's where the 2.x packages hide "glibconfig.h" and "gdkconfig.h". svn path=/trunk/; revision=7894
2003-06-16"!IFDEF" just takes the name of the variable as an argument.Guy Harris1-4/+4
We do have to look for headers in $(GTK_DIR)\gdk when using the development packages from the Ethereal Web site, as "gdkconfig.h" is in that directory but it's included as <gdkconfig.h>. The commented string for ADNS_CONFIG doesn't appear to get substituted as we want it to be; just use an empty string for now. svn path=/trunk/; revision=7892
2003-06-15Do all the tests for whether ADNS_DIR is defined or not inGuy Harris1-1/+11
"config.nmake", and just use the variables set based on the results of those tests in various "Makefile.nmake" files. svn path=/trunk/; revision=7891
2003-06-15Based on a change from Lars Roland, set the GLIB_CFLAGS, GTK_CFLAGS,Guy Harris1-2/+33
GLIB_LIBS, and GTK_LIBS variables based on whether the GLib and GTK+ header files and libraries are in separate "glib" and "gtk+" directories (as is the case for the developer's packages from the Ethereal Web site) or in the same directory (as is the case for the developer's packages from the GTK+-for-Win32 site). svn path=/trunk/; revision=7890
2003-06-14Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based onGuy Harris1-1/+6
variables the user configures - the user isn't expected to change GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users shouldn't have to do so), which contain the appropriate libraries for building stuff that requires only GLib, and stuff that required GTK+ and GLib, respectively, and use those macros in the Makefile.nmake files. svn path=/trunk/; revision=7885
2003-06-14Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based onGuy Harris1-1/+13
variables the user configures - the user isn't expected to change GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users shouldn't have to do so), which contain the appropriate "/I" flags for building stuff that requires only GLib, and stuff that required GTK+ and GLib, respectively, and use those macros in the Makefile.nmake files. svn path=/trunk/; revision=7884
2003-06-14From Lars Roland: use $(COMMON_FILES_GNU) in the PATH setting, don'tGuy Harris1-2/+2
duplicate the setting of $(COMMON_FILES_GNU). svn path=/trunk/; revision=7883
2003-06-13As per a patch from Lars Roland, make RC_VERSION comma-separated.Guy Harris1-2/+13
Also put in a comment noting that it should be comma-separated, and noting why it should be comma-separated. svn path=/trunk/; revision=7880
2003-06-12Don't wire into "config.h.win32" files an indication of whether we haveGuy Harris1-1/+9
GNU ADNS or not - set it based on whether ADNS_DIR is defined by "config.nmake", and make "config.h.win32" files that specify whether we have GNU ADNS dependent on "config.nmake". Note in "config.nmake" that: if you have GNU ADNS, ADNS_DIR should be defined as the directory in which the ADNS .lib file resides; if you don't have GNU ADNS, ADNS_DIR shouldn't be defined. svn path=/trunk/; revision=7860
2003-06-10Bump the version to 0.9.13 and otherwise prep for the next release. ETA isGerald Combs1-3/+3
Wednesday. svn path=/trunk/; revision=7820
2003-06-02Add GNU ADNS to the Windows build environment. A precompiled DLL can beGerald Combs1-1/+2
found at http://adns.jgaa.com/ and http://www.ethereal.com/distribution/win32/development/ The modifications to the root-level config.h.win32 and Makefile.nmake may not be neccessary. svn path=/trunk/; revision=7769
2003-05-01Bump the version number to 0.9.12. Make NEWS and ChangeLog current.Gerald Combs1-3/+3
The next release will likely be tomorrow (May 1). svn path=/trunk/; revision=7622
2003-03-26From Graham Bloice: make the RC_VERSION variable in config.nmakeGuy Harris1-2/+2
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
2003-03-11Bump the version to 0.9.11. Let's hope the goat's blood and hastily carvedGerald Combs1-3/+3
idol is enough for the CVS gods. svn path=/trunk/; revision=7337
2003-03-04Bump the version to 0.9.10.Gerald Combs1-3/+3
svn path=/trunk/; revision=7271
2003-01-21Bump the version to 0.9.9. Update the NEWS and ChangeLog files.Gerald Combs1-3/+3
I'm shooting for a release on Wednesday evening. svn path=/trunk/; revision=6952
2002-12-04Bump the version to 0.9.8. Update NEWS and ChangeLog to October 24.Gerald Combs1-3/+3
svn path=/trunk/; revision=6741
2002-11-01Cygwin doesn't necessarily come with an "sh.exe", so use "$(SH)" ratherGuy Harris1-1/+2
than "sh" to run a Bourne-compatible shell in "Makefile.nmake", and define "SH" to be "bash" in "config.nmake". svn path=/trunk/; revision=6540
2002-10-09Link to libsnmp under Win32.Gerald Combs1-1/+2
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs so that we can drop the MIB files there, instead of the default c:\usr\... path. Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly. Define HAVE_UCD_SNMP in config.h.win32. I tested this by creating c:\program files\ethereal\snmp\mibs and dropping in the MIB files that come with Net-SNMP. Ethereal resolved system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows. Under Linux it resolved to "SNMPv2-MIB::sysDescr.0". Ethereal.nsi still needs to be updated. A compiled version of the Net-SNMP library can be found at http://www.ethereal.com/distribution/win32/development/ svn path=/trunk/; revision=6385
2002-09-26Bump the version up to 0.9.7. The countdown begins. Too bad ourGerald Combs1-3/+3
releases don't involve explosive bolts like NASA launches do. Bring the ChangeLog and NEWS files up to date to the end of August. svn path=/trunk/; revision=6341
2002-08-19Add COMMON_FILES_GNU definition.Gerald Combs1-1/+3
svn path=/trunk/; revision=6021
2002-08-17Bump the version number to 0.9.6. Update the ChangeLog. Add roughGerald Combs1-3/+3
release notes to NEWS. svn path=/trunk/; revision=6006
2002-06-28Bump the version up to 0.9.5.Gerald Combs1-3/+3
svn path=/trunk/; revision=5779
2002-05-18Increment versions to 0.9.4, get NEWS current to April 25 (more NEWS toGerald Combs1-3/+3
come). svn path=/trunk/; revision=5500
2002-03-29Bump the version to 0.9.3. Update NEWS to be current toGerald Combs1-3/+3
http://www.ethereal.com/lists/ethereal-cvs/200203/msg00175.html (the rest will be added later). svn path=/trunk/; revision=5042
2002-03-03Bump the version to 0.9.2. Update NEWS to include everything from February.Gerald Combs1-3/+3
svn path=/trunk/; revision=4856
2002-02-02Update version to 0.9.1. Add NEWS entries for 0.9.1 changes.Gerald Combs1-3/+3
svn path=/trunk/; revision=4684
2002-01-04From Hamish Moffatt:Guy Harris1-3/+3
Additional Windows Makefile dependencies, so more stuff gets built as needed. Additional stuff cleaned up by "make clean" (well, "nmake -f makefile.nmake clean", anyway) Make PDB_FILE be "vc*.pdb", so it referes to the PDB files either for VC++ 5.0 or VC++ 6.0. svn path=/trunk/; revision=4481
2002-01-04From Hamish Moffatt:Guy Harris1-8/+9
Add some missing files in the "clean" targets. Use pod2html rather than man2html to build HTML man pages. Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo. svn path=/trunk/; revision=4475
2001-12-23Bump the version up to 0.9.0. Update the NEWS file.Gerald Combs1-3/+3
svn path=/trunk/; revision=4440
2001-12-19From Motonori Shindo: don't put the PDB files into the release, asGuy Harris1-1/+3
they're not built and the executables already contain debugging information, and update the README.win32 file appropriately and add Text2Pcap and Mergecap to it. svn path=/trunk/; revision=4425
2001-12-12From Motonori Shindo:Guy Harris1-1/+2
fix a bogus batch mode inference rule of make, so that "vc60.pdb" files are created in the proper directory; delete ".pdb" files in a "nmake -f Makefile.nmake clean"; include the text2pcap and mergecap ".pdb" files in the Windows binary distribution. svn path=/trunk/; revision=4385
2001-10-12Get NEWS current up to July 31, update version to 0.8.20.Gerald Combs1-3/+3
svn path=/trunk/; revision=4021
2001-07-13Updated for release 0.8.19Jeff Foster1-3/+3
svn path=/trunk/; revision=3716
2001-07-12Package mergecap.exe and its HTML documentation.Gilbert Ramirez1-2/+2
Update NSIS syntax for newest NSIS. That fix from David O'Shea. Set config.nmake to get non-cygwin version of Python.exe; cygwin version is fouling up on me and I'm not sure why. svn path=/trunk/; revision=3705
2001-05-16Update files for release 8.18Jeff Foster1-3/+3
svn path=/trunk/; revision=3415
2001-04-11Updated for release 0.8.17Jeff Foster1-3/+3
svn path=/trunk/; revision=3289
2001-04-06Build with zlib.Gilbert Ramirez1-2/+2
Pre-compiled zlib provided at http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip "fixed" because the pre-compiled version in the "extralibs" package from the Gimp/Win32 page has a fault zlib.lib in it. Add note about zlib in README.win32; more work needs to be done to this file to mention new packaging method. svn path=/trunk/; revision=3263
2001-04-05Use sed in the Win32 build to place the version in various files.Gilbert Ramirez1-1/+2
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
2001-04-04Packaging files for Win32, using NSIS, the NullSoft Installer, thatGilbert Ramirez1-2/+4
was originally written for WinAmp. See http://www.nullsoft.com/free/nsis/ svn path=/trunk/; revision=3255
2001-03-23The Win32 build builds wiretap as a DLL and requires WinPcap 2.1.Gilbert Ramirez1-1/+3
svn path=/trunk/; revision=3163
2001-03-09Add ability to create HTML documentation on Windows, if you haveGilbert Ramirez1-0/+4
perl and man2html. Don't call this makefile from the parent makefile as not everyone will want to create documentation. Add a couple variables to config.nmake to support this. svn path=/trunk/; revision=3119
2001-03-06Add some win32-specific targets in .cvsignore's.Gilbert Ramirez1-3/+3
Replace 'nmake' with $(MAKE) /$(MAKEFLAGS), from Mike Frisch. svn path=/trunk/; revision=3108
2000-10-14Move inet_*.[ch] files to epan.Gilbert Ramirez1-5/+9
svn path=/trunk/; revision=2494
2000-07-28Add the re-write of the NetWare Core Protocol dissector. It's mostlyGilbert Ramirez1-0/+2
a framework for the dissector; of the more than 400 NCP packet types, only a handful are defined. But this dissector framework is much better than the previous one. svn path=/trunk/; revision=2173
2000-04-29Graham Bloice's changes to, on Win32 using Microsoft's "nmake":Guy Harris1-2/+3
build "register.c" in the top-level Makefile; set path in "config.nmake" to include the Cygwin directory for tools - those tools are needed to build "register.c"; remove constructed source files, and some additional object files, when doing "nmake clean". svn path=/trunk/; revision=1896
2000-04-12Build tethereal and editcap on Win32.Gilbert Ramirez1-1/+1
Add RCS ID tags to Makefile.nmake's. svn path=/trunk/; revision=1836
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:49:11 +0000