Commit graph

133 commits

Author SHA1 Message Date
Michael Tüxen
8986cd7228 gtkvumeter.[ch] seems to be used only on Windows. So only build it there...
svn path=/trunk/; revision=38332
2011-08-04 11:24:15 +00:00
Stig Bjørlykke
dcbfc168b1 Add a missing dependency for text_import_scanner_lex.h
svn path=/trunk/; revision=37817
2011-06-28 15:30:28 +00:00
Bill Meier
d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- 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-02-02 01:19:53 +00:00
Jeff Morriss
ad2730d302 Convert the .c file names to .obj before putting them in WIRESHARK_GTK_OBJECTS.
svn path=/trunk/; revision=35081
2010-11-30 21:32:04 +00:00
Jeff Morriss
b8cb5e53ff Move the port audio source into a separate variable which is not run through checkapi.
svn path=/trunk/; revision=35080
2010-11-30 20:57:43 +00:00
Jeff Morriss
c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss
5f3ff94816 Move the checkapi targes to Makefile.common. Rename Makefile.nmake's WIRESHARK_GTK_SRC to WIRESHARK_GTK_ALL_SRC to avoid reusing the variable of the same name from Makefile.common; Put DIRTY_GENERATED_C_FILES back in that variable since checkapi is no longer run on it.
svn path=/trunk/; revision=35069
2010-11-29 20:53:22 +00:00
Jeff Morriss
6dc182c9d9 Remove DIRTY_GENERATED_C_FILES from WIRESHARK_GTK_SRC so we don't run checkapi on it. Also remove capture_if_details_dlg_win32.c from the checkapi list since it's in WIRESHARK_GTK_SRC (which is in the list of files checkapi is run against).
svn path=/trunk/; revision=35067
2010-11-29 20:37:24 +00:00
Stephen Fisher
587bd2724f Move native Win32 code to its own directory and out of gtk directory (hopefully without breaking any builds)
svn path=/trunk/; revision=35032
2010-11-26 19:16:06 +00:00
Jeff Morriss
d63f2559da Split libui into libui and libui_dirty. The latter contains (only)
text_import_scanner.c (which is generated and not by us so we can't guarantee
that it's clean).

svn path=/trunk/; revision=34912
2010-11-16 20:13:26 +00:00
Anders Broman
4323fa647d Try to clean up the makefile a bit.
svn path=/trunk/; revision=34898
2010-11-16 09:15:15 +00:00
Anders Broman
cc8992668c Try to fix the build for text_import_scanner.
Please check if the compile flags are OK...
3:d time lucky ?

svn path=/trunk/; revision=34862
2010-11-13 16:47:57 +00:00
Anders Broman
702a76a99b Try to fix the build for text_import_scanner.
Please check if the compile flags are OK...

svn path=/trunk/; revision=34861
2010-11-13 16:24:14 +00:00
Anders Broman
06d94db99f Try to fix the build for text_import_scanner,
not sure if it's correct but now it builds text_import_scanner.c
but still fails with:

c:\wireshark\gtk\text_import.h(34) : fatal error C1083: Cannot open include file
: 'glib.h': No such file or directory
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 9.0\
VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 9.0\
VC\BIN\nmake.exe"' : return code '0x2'
Stop.

svn path=/trunk/; revision=34858
2010-11-13 14:47:53 +00:00
Bill Meier
f3526b9cf5 Fix checkAPI targets so gtk-deprecated and gtk-deprecated-todo checks are
properly done. (gtk-deprecated check got inadvertantly removed a while back).

svn path=/trunk/; revision=33599
2010-07-21 00:04:04 +00:00
Anders Broman
fc0932168f Run deprecated-gtk-todoon all files in the gtk dir.
svn path=/trunk/; revision=32638
2010-05-02 21:42:53 +00:00
Kovarththanan Rajaratnam
dd4e4fc6d6 make-tapreg-dotc has moved to tools/make-tapreg-dotc
svn path=/trunk/; revision=30293
2009-10-04 09:12:14 +00:00
Anders Broman
31132240f9 Make it possible to run checkapi with "deprecated-gtk-todo".
svn path=/trunk/; revision=29479
2009-08-19 18:39:30 +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
91caa01090 Add /MP flag to make use of multi cores.
svn path=/trunk/; revision=29104
2009-07-15 20:55:31 +00:00
Bill Meier
edc59eb340 Add checkapi for deprecated Gtk APIs for which Wireshark is currently clean.
checkapi will Error if any of these APIs are seen. 

svn path=/trunk/; revision=27730
2009-03-15 20:20:54 +00:00
Anders Broman
590bc1122c Replace the clists with gtk_list_store
Should fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3246

svn path=/trunk/; revision=27489
2009-02-20 17:13:44 +00:00
Gerald Combs
ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs
1ac736e634 Simplify the PortAudio section.
svn path=/trunk/; revision=26030
2008-08-15 00:07:16 +00:00
Gerald Combs
bb8e507f31 From cjkelly1: Add "/MD" to the PortAudio compilation flags. Fixes
bug 2791.

Don't use "-o" in the PortAudio compilation flags. If we're running Visual
C++ 2008, don't use "/Zd" when compiling packet-rrc.c. Fixes bug 2795.

svn path=/trunk/; revision=26023
2008-08-14 20:56:34 +00:00
Guy Harris
a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Anders Broman
36d89bb79c Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25368
2008-05-23 05:55:34 +00:00
Tomas Kukosa
a1d164a5da Update to Portaudio pa_stable_v19_20071207
svn path=/trunk/; revision=25285
2008-05-13 07:39:23 +00:00
Anders Broman
b6454e76ac Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25244
2008-05-06 05:50:31 +00:00
Ulf Lamping
fe630dbde0 ... bring into alphabetical order
svn path=/trunk/; revision=25087
2008-04-17 02:17:55 +00:00
Ulf Lamping
6a5b1e0ec0 use the ending "_win32" for every windows specific file
svn path=/trunk/; revision=24972
2008-04-13 12:14:57 +00:00
Jörg Mayer
094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Gerald Combs
55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Ulf Lamping
407d0aeab0 fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag
svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
Bill Meier
04d29de81d Fix Windows Makefiles so clean removes all pdb files (PDB_FILE no longer defined)
svn path=/trunk/; revision=21052
2007-03-18 15:36:22 +00:00
Ulf Lamping
c7936a1c37 fix a comment typo
svn path=/trunk/; revision=20731
2007-02-07 02:45:53 +00:00
Gerald Combs
bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +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
Gerald Combs
a980d04783 From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support.

WEP key preferences have been overloaded to allow WPA keys.  The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.

Add a few text and whitespace fixups.

svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +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
Ulf Lamping
ee0f84c846 rtp_player.c is already included in WIRESHARK_GTK_SRC, no need to mention it twice
svn path=/trunk/; revision=19299
2006-09-23 00:28:04 +00:00
Ulf Lamping
04fe34d711 various nmake related build file cleanups
svn path=/trunk/; revision=19198
2006-09-12 00:27:03 +00:00
Bill Meier
9568b76a63 minor cleanup for making codecs
svn path=/trunk/; revision=19184
2006-09-10 13:37:42 +00:00
Anders Broman
9ea41277f9 Fix path and name.
svn path=/trunk/; revision=19120
2006-09-02 14:18:47 +00:00
Guy Harris
0ec3e5661f Move the codecs into a top-level "codecs" subdirectory; there's no
guarantee that all programs using the codecs will necessarily be using
GTK+.

svn path=/trunk/; revision=19117
2006-09-02 06:39:43 +00:00
Anders Broman
7eac3c2879 From Alejandro Vaquero:
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to 
compile it is necessary to:
       + For windows: uncomment the line 
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
       + For linux: using the "--with-portaudio=yes"

svn path=/trunk/; revision=19094
2006-08-30 21:51:31 +00:00
Gerald Combs
eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Ulf Lamping
9276efd7d9 if HHC_DIR is defined in config.nmake, use the Win32 HTMLHELP system (using the user-guide.chm file)
svn path=/trunk/; revision=17932
2006-04-20 20:27:44 +00:00
Gerald Combs
80e5e0fb15 Copy over the file open/save code from the Win32 native branch.
The Windows-native routines were integrated by inserting

#if GTK_MAJOR_VERSION >= 2 && _WIN32
  win32_native_routine(GDK_WINDOW_HWND(top_level->window));
  return;
#endif

at the beginning of each GTK+ file routine.  There's probably a prettier
way to do this.

Some of the sizes need to be tweaked in win32-file-dlg.rc, but everything
seems to work.

Fix up whitespace.

svn path=/trunk/; revision=17285
2006-02-13 21:25:43 +00:00
Jörg Mayer
83068a9b9d Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.


The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.


svn path=/trunk/; revision=17200
2006-02-07 10:26:20 +00:00