Commit Graph

342 Commits

Author SHA1 Message Date
Kovarththanan Rajaratnam 10ce541917 Reorder so that mandatory requirements appear in succession
svn path=/trunk/; revision=29560
2009-08-26 07:05:50 +00:00
Kovarththanan Rajaratnam 0dead996a2 win-iconv is statically linked as part of Glib >= 2.14.5, so remove it from config.nmake
svn path=/trunk/; revision=29559
2009-08-26 06:54:48 +00:00
Kovarththanan Rajaratnam 8bc2261d24 Back out r29323. The non fully qualified path seems to work for everyone else so don't mess with it.
svn path=/trunk/; revision=29324
2009-08-07 14:01:44 +00:00
Kovarththanan Rajaratnam cdf7fda658 Use fully qualified path to bash
svn path=/trunk/; revision=29323
2009-08-07 13:18:02 +00:00
Anders Broman e040dac13f Revert change by mistake.
svn path=/trunk/; revision=29201
2009-07-26 22:18:11 +00:00
Anders Broman 3bbe2106c5 From Kovarththanan Rajaratnam:
- Don't issue a row_inserted signal. Rely on our caller to have  
disconnected the model from the view.

-  Removing col_fmt from row_data. It wasn't being used. If we need to store
the column format in the future that should probably be placed in the
PacketList instead of the PacketListRecord
2) Remove double allocation of col_text. Now we allocate it in
new_packet_list_append() and pass it on to packet_list_append_record()
3) Use se_alloc instead of se_alloc0 because we explictly set all the
parameters we use.

svn path=/trunk/; revision=29199
2009-07-26 22:11:46 +00:00
Jeff Morriss bca2a16879 /MP also works with 2008EE
svn path=/trunk/; revision=29116
2009-07-16 12:39:50 +00:00
Anders Broman 67d6f5976e Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake
for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114
2009-07-16 08:27:18 +00:00
Anders Broman 907673a91c Revert checkin made by misstake(don't use new packet list).
svn path=/trunk/; revision=28949
2009-07-06 13:34:30 +00:00
Anders Broman 1415c62c68 Fix:
packet-ndmp.c:562: warning: unused parameter 'pinfo'

svn path=/trunk/; revision=28936
2009-07-03 13:05:45 +00:00
Anders Broman 39139dc75c Sligtly modify Stig's fix, I forgot the makefile change :-(
svn path=/trunk/; revision=28906
2009-07-01 11:40:24 +00:00
Stig Bjørlykke 8324323784 Try to fix HAVE_NEW_PACKET_LIST handling.
svn path=/trunk/; revision=28905
2009-07-01 11:12:58 +00:00
Anders Broman ddad90c3e3 Make it possible to configure use of NEW_PACKET_LIST and fix
one compile error. It still fails in file.c trying to include gtk/gtk.h in new_packet_list.h

svn path=/trunk/; revision=28903
2009-07-01 08:23:32 +00:00
Graeme Lunt 6b64331033 Update to you the latest UPX executable/dll compressor.
svn path=/trunk/; revision=28718
2009-06-13 08:26:11 +00:00
Tomas Kukosa 40cc6f9108 Update to the GnuTLS 2.8.1
svn path=/trunk/; revision=28689
2009-06-10 21:08:01 +00:00
Gerald Combs fffb5f5043 Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28688
2009-06-10 20:58:05 +00:00
Gerald Combs 8adf270b5e Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28686
2009-06-10 18:06:33 +00:00
Gerald Combs 1d0ae8dadb Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
2009-06-10 01:30:49 +00:00
Gerald Combs cdae660d2a Update KFW to 2.6.5.
svn path=/trunk/; revision=28683
2009-06-09 23:54:07 +00:00
Gerald Combs bc469b1f79 Move the trunk to 1.3.
svn path=/trunk/; revision=28495
2009-05-26 20:53:28 +00:00
Tomas Kukosa 0a101aacf6 Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK
svn path=/trunk/; revision=28314
2009-05-08 19:53:41 +00:00
Anders Broman b96b6756c9 Use GTK+ 2.16.1-1
svn path=/trunk/; revision=28180
2009-04-27 16:50:58 +00:00
Gerald Combs 2739bf8819 Use the CRT version appropriate for our target architecture.
svn path=/trunk/; revision=28079
2009-04-17 19:02:56 +00:00
Gerald Combs 7b3b6ed3f9 Check for the existence of a couple of directories and add variables for DLL
names.

svn path=/trunk/; revision=28070
2009-04-16 21:34:44 +00:00
Gerald Combs c0ebf76780 Fix (and likely re-break) the Windows builds:
- Use the latest WinPcap Developer's Pack.
  - In file_dlg_win32.c, try to fix Visual C++ 6.0 compilation.
  - #if 0 out a bunch of definitions in capture_if_details_dlg_win32.c
    that already exist in Ntddndis.h.

svn path=/trunk/; revision=28067
2009-04-16 18:14:38 +00:00
Gerald Combs 1c3e3a4a53 Switch back to 1.1.4.
svn path=/trunk/; revision=27810
2009-03-20 23:15:15 +00:00
Gerald Combs ecd732384c Temporarily switch back to building 1.1.3 final.
svn path=/trunk/; revision=27807
2009-03-20 16:17:02 +00:00
Anders Broman db6795dc82 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
2009-03-19 06:42:46 +00:00
Gerald Combs 31ea1d7aac Fix the Lua path on Win64.
svn path=/trunk/; revision=27777
2009-03-18 17:05:41 +00:00
Gerald Combs 2d24475011 Move to 1.1.4.
svn path=/trunk/; revision=27767
2009-03-18 05:42:03 +00:00
Anders Broman e7ccbd26d1 Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
2009-03-17 21:33:15 +00:00
Anders Broman 2a6752e050 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27762
2009-03-17 20:21:16 +00:00
Gerald Combs 0d446ae826 Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
2009-03-11 16:13:17 +00:00
Bill Meier a910aed306 gettext library setup: Fix a bug and adjust config slightly for win32 so
gettext setup works the way I think was intended.

svn path=/trunk/; revision=27644
2009-03-07 18:48:25 +00:00
Gerald Combs 2731028a0c Fix Win32 build breakage.
svn path=/trunk/; revision=27634
2009-03-07 03:25:01 +00:00
Gerald Combs 8f69ddeb00 Add preliminary support for Win64 compilation. Attempt to use the same
set of makefiles and scripts for each platform as much as possible.

svn path=/trunk/; revision=27633
2009-03-07 01:06:40 +00:00
Gerald Combs 57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
Gerald Combs 07e5df616e Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
2009-03-02 18:57:35 +00:00
Tomas Kukosa fe53605ff9 Update GnuTls to gnutls-2.6.4-1
svn path=/trunk/; revision=27398
2009-02-09 09:38:58 +00:00
Gerald Combs 414d042d2e Change the version to 1.1.3. SVN-stamp the version again.
svn path=/trunk/; revision=27252
2009-01-16 22:35:14 +00:00
Gerald Combs 9b852da8a5 Enable GeoIP if INETSDK is defined (which should mean we have IPv6
definitions even if we're running Visual C++ 6.0).

svn path=/trunk/; revision=27137
2008-12-30 20:05:58 +00:00
Gerald Combs 08364de20d Try to fix a compilation error with Visual C++ 6.0.
svn path=/trunk/; revision=27135
2008-12-30 18:27:34 +00:00
Gerald Combs c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs c9c32db187 Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.

svn path=/trunk/; revision=27041
2008-12-17 21:11:20 +00:00
Tomas Kukosa 408d562a5c Update GnuTls to gnutls-2.6.3-1
svn path=/trunk/; revision=26998
2008-12-15 11:52:06 +00:00
Gerald Combs e137f6cb76 Use c-ares 1.6.0.
svn path=/trunk/; revision=26961
2008-12-10 22:16:09 +00:00
Bill Meier 94c73a47c9 Compile flags: Use /DWIN32_LEAN_AND_MEAN; Add note re using /MP for faster build
(/MP means "compile multiple source files by using multiple processes")

svn path=/trunk/; revision=26553
2008-10-25 14:33:34 +00:00
Gerald Combs f5b461c34f If PYTHON hasn't been defined, look for Python 2.6, 2.5, and 2.4 (in
that order). If found, set up Python automatically.

svn path=/trunk/; revision=26452
2008-10-14 16:37:47 +00:00
Gerald Combs 193ad40a59 Switch back to 1.1.2.
svn path=/trunk/; revision=26392
2008-10-09 05:07:24 +00:00
Gerald Combs 57a1c7be61 Try for another 1.1.1 development release.
svn path=/trunk/; revision=26374
2008-10-07 21:29:25 +00:00