osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
19,938 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

221 Commits

Author SHA1 Message Date
Ulf Lamping 2d760bf075 in effect use the User's Guide as the online help system now (for GTK > V1)! 
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)

svn path=/trunk/; revision=20446
 2007-01-16 04:08:35 +00:00
Ulf Lamping 13a095e055 no, we're still not using MSVC2005 as default :-( 
should fix the Win32 buildbot ...

svn path=/trunk/; revision=20413
 2007-01-13 04:28:26 +00:00
Ulf Lamping 19bd3956a2 fix some remaining MSVC != V6 issues: 
- add redistributables (msvcr*.dll) to the NSIS installer (depending on MSVC_VARIANT)
- split MSVC2006 and MSVC2006EE (Express Edition) settings in config.nmake, as redistributable settings for NSIS are different
- remove Platform SDK setting from config.nmake, it's not needed

svn path=/trunk/; revision=20411
 2007-01-13 00:59:39 +00:00
Ulf Lamping ab31b4fa4d add the ".NET Framework SDK V1.0" to the list of working MSVC_VARIANTS :-) 
svn path=/trunk/; revision=20390
 2007-01-11 07:53:01 +00:00
Ulf Lamping dab6935453 various msvc / zlib config cleanup 
svn path=/trunk/; revision=20383
 2007-01-10 21:45:19 +00:00
Ulf Lamping 393537a7f8 fix the HHC_DIR settings for none MSVC6 variants 
svn path=/trunk/; revision=20375
 2007-01-10 09:56:39 +00:00
Ulf Lamping 49fd1e07c8 from Laurent Rabret: 
use /MD switch instead of direct linker switches
(hopefully this will fix linker issues mentioned by Andrew and Stephen)

svn path=/trunk/; revision=20370
 2007-01-10 03:11:13 +00:00
Ulf Lamping e71b416608 fix compilation for: 
- Visual Studio .NET (2002)
- Visual Studio .NET 2003

svn path=/trunk/; revision=20349
 2007-01-08 22:29:18 +00:00
Ulf Lamping 7a7c7ea302 Oops, I did it again ;-) 
C:\Programme -> C:\Program Files

svn path=/trunk/; revision=20339
 2007-01-08 03:31:28 +00:00
Ulf Lamping e456b4fcd6 if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap 
svn path=/trunk/; revision=20337
 2007-01-08 02:40:06 +00:00
Ulf Lamping 8fb030d900 fix GNUTLS compiling issue on recent MSVC versions by switching off Wincrypt.h, see: http://www.mail-archive.com/openssl-dev@openssl.org/msg03802.html for details 
svn path=/trunk/; revision=20336
 2007-01-07 19:50:16 +00:00
Ulf Lamping cc164653a0 add experimental support for some more of the MSVC_VARIANTs: 
- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
 2007-01-06 01:05:59 +00:00
Ulf Lamping 1a25d263d6 don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594 
svn path=/trunk/; revision=20324
 2007-01-05 05:23:02 +00:00
Ulf Lamping 3a1a07c46a compile error in openssl.h depends on the Platform SDK, not the MSVC variant used 
change the !IFDEF around GNUTLS accordingly

svn path=/trunk/; revision=20323
 2007-01-05 05:03:15 +00:00
Ulf Lamping b6fd719414 move the directory settings more to the top, add an optional platform SDK setting 
svn path=/trunk/; revision=20322
 2007-01-05 04:58:52 +00:00
Gerald Combs 7d0118ff10 Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable 
AirPcap.

svn path=/trunk/; revision=20321
 2007-01-05 01:35:23 +00:00
Ulf Lamping ba961e3ba8 add the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is the one described in the corresponding Wiki page) 
mark "Visual Studio 2005" (without Express) as EXPERIMENTAL too, seems to be working just like the Express Edition :-)

svn path=/trunk/; revision=20313
 2007-01-04 20:51:18 +00:00
Ulf Lamping d736a37664 another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ... 
svn path=/trunk/; revision=20297
 2007-01-03 22:09:15 +00:00
Ulf Lamping 97df0c4a56 hmmm, maybe he don't like mixing slashes and backslashes ... 
svn path=/trunk/; revision=20292
 2007-01-03 06:41:17 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info 
add some missing files to the clean targets

svn path=/trunk/; revision=20290
 2007-01-03 05:41:11 +00:00
Ulf Lamping 17d57d538c Instead of hard coding "C:/program files", use the corresponding environment variable %ProgramFiles% (hopefully this is available on all supported platforms). This makes it possible to use the same unchanged setting even for internationalised Windows versions (e.g. in the german version this is: "C:\Programme") 
svn path=/trunk/; revision=20288
 2007-01-03 04:28:28 +00:00
Ulf Lamping 15fd728985 move the MSVC "block" towards the top of the file 
don't use GNUTLS and ZLIB when compiling with MSVC != Version 6 - it currently doesn't work

svn path=/trunk/; revision=20283
 2007-01-03 02:53:30 +00:00
Ulf Lamping 578e62131e make MSVC6 the default for MSVC_VARIANT, not MSVC2005 
svn path=/trunk/; revision=20265
 2007-01-02 13:05:04 +00:00
Ulf Lamping 6bb21fbafd first MSVC 2005 changes: 
- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)

svn path=/trunk/; revision=20258
 2007-01-02 01:19:40 +00:00
Anders Broman 0e063dc29c Use portaudio v19. 
svn path=/trunk/; revision=20225
 2006-12-27 22:21:46 +00:00
Bill Meier 81ab78cddb Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake; 
I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221
 2006-12-26 22:40:49 +00:00
Ulf Lamping a672d53330 cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are) 
set VERSION_EXTRA back to empty - I guess this was checked in by mistake

svn path=/trunk/; revision=20218
 2006-12-26 20:20:52 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0. 
svn path=/trunk/; revision=20204
 2006-12-23 00:06:16 +00:00
Anders Broman 686b41801c Update to use gtk 2.10.6 and friends. 
svn path=/trunk/; revision=20188
 2006-12-21 22:15:34 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and 
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
 2006-12-08 15:05:41 +00:00
Gerald Combs 8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler 
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
 2006-12-06 20:29:54 +00:00
Bill Meier bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162); 
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
 2006-12-04 05:41:53 +00:00
Anders Broman 09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries. 
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
 2006-11-12 22:18:50 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct. 
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
 2006-11-05 22:46:44 +00:00
Gerald Combs a076a8731d Bump the version to 0.99.5. 
svn path=/trunk/; revision=19781
 2006-11-03 06:55:30 +00:00
Ulf Lamping 15260339d7 change the default GTK version from GTK2.6 to GTK2.8 
svn path=/trunk/; revision=19728
 2006-10-29 14:41:16 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository 
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
 2006-10-27 12:06:13 +00:00
Anders Broman 0880bc54d0 Preparations for using the latest GTK 2.8 files for now only gettext is updated. 
svn path=/trunk/; revision=19695
 2006-10-26 07:25:07 +00:00
Jörg Mayer 926ed8aa01 Alejandro Vaquero: 
Add portaudio v19 support in addition to v18:

   Here is a patch using the API 2 (v19). I tested it only in Windows.
Attached also the Windows v19 zip file used. I did not modify the
Makefile.nmake to download this new version (when running the "setup"),
because Windows v18 it is still good.


svn path=/trunk/; revision=19446
 2006-10-07 14:24:32 +00:00
Gerald Combs 2649d26145 Fix WEP key bug in the AirPcap code that could cause a crash. Enable 
AirPcap by default. Add initial support for the "Any" device in AirPcap
(more to come).

svn path=/trunk/; revision=19401
 2006-10-02 23:44:10 +00:00
Gerald Combs 0678c4f7c4 Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should 
fix bug 1096.

Switch back to fetching a date-stamped URL in win32-setup.sh.  This
ensures backward compatibility with previous releases and non-updated
SVN trees.

svn path=/trunk/; revision=19339
 2006-09-27 18:02:40 +00:00
Luis Ontanon 354983d30d use luaforge's 5.1 dll to be able to link on windows. fix some mistakes 
svn path=/trunk/; revision=19331
 2006-09-27 00:45:55 +00:00
Luis Ontanon c8a95a0548 Lua 5.1.1 for windows 
svn path=/trunk/; revision=19324
 2006-09-26 03:31:00 +00:00
Ulf Lamping 3fa7bc5f0c change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files. 
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...

svn path=/trunk/; revision=19302
 2006-09-23 01:39:07 +00:00
Ulf Lamping 1048fafb27 so it's HAVE_LIBPORTAUDIO 
svn path=/trunk/; revision=19228
 2006-09-13 11:28:36 +00:00
Ulf Lamping edae542c06 it's HAVE_PORTAUDIO, not HAVE_LIBPORTAUDIO 
svn path=/trunk/; revision=19215
 2006-09-12 17:45:43 +00:00
Ulf Lamping 04fe34d711 various nmake related build file cleanups 
svn path=/trunk/; revision=19198
 2006-09-12 00:27:03 +00:00
Ulf Lamping 9fee393b87 tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds) 
svn path=/trunk/; revision=19196
 2006-09-11 22:47:57 +00:00
Ulf Lamping 1d1f904321 let the user only specify the PortAudio version and do the "ugly details" in the part below, just as we do it for most other libs 
svn path=/trunk/; revision=19195
 2006-09-11 22:43:00 +00:00
Anders Broman a1f8b7e084 From Alejandro Vaquero: 
Need to use HAVE_LIBPORTAUDIO instead 
of PORTAUDIO_DIR in voip_calls.c

And build the windows version with Port audio.

svn path=/trunk/; revision=19187
 2006-09-10 18:03:22 +00:00