diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-15 00:23:13 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-01-15 00:23:13 +0000 |
| commit | 339d67b043a1f1ac860b84ed48ec6ba77d96f487 (patch) | |
| tree | 0ab0f799055b6e6bb48ddc02d21fa608874b4ee4 /wiretap | |
| parent | dbf3bf6177946f2e21efdb7a64ec32c8ee02eb74 (diff) | |
Merge in the final code to make Ethereal run on Win32, compiled
with MSVC 6.0 and 'nmake', the make tool that comes with MSVC.
It compiles, links, and runs. It doesn't run correctly. There's a problem
when reading files. I'm getting short reads. I'm not linking in zlib or
libsnmp because it first needs to be debugged.
I changed the plugin code to use gmodule instead of libltdl, but the
Unix build still links ethereal against libltdl. I'll fix that tonight; sorry
about leaving it in such a sad state, but I wanted to check in this code
before I left work on a Friday night. Ethereal still works, but the
building is less than optimal.
svn path=/trunk/; revision=1479
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.nmake | 3 | ||||
| -rw-r--r-- | wiretap/config.h.win32 | 27 |
2 files changed, 11 insertions, 19 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 44aa4ffc5b..755f5f9fd2 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -1,5 +1,4 @@ -GLIB_DIR=c:\prj\gtk+-win32\src\glib -#LOCAL_CFLAGS=/Ic:\tools\msdev\include +GLIB_DIR=T:\w32-ix86\glib LOCAL_CFLAGS= #################3 diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32 index 249df566d2..4c3529aca6 100644 --- a/wiretap/config.h.win32 +++ b/wiretap/config.h.win32 @@ -1,23 +1,12 @@ + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -/* #undef HAVE_GLIB10 */ - -/* Define if you have the <netinet/in.h> header file. */ -/* #undef HAVE_NETINET_IN_H */ - -/* Define if you have the <sys/time.h> header file. */ -/* #undef HAVE_SYS_TIME_H */ +/* Define if you have the <unistd.h> header file. */ +/* #define HAVE_UNISTD_H */ /* Define if you have the z library (-lz). */ -/* #undef HAVE_LIBZ */ +/*#define HAVE_LIBZ 1*/ /* Name of package */ #define PACKAGE "libwtap.a" @@ -27,5 +16,9 @@ #define HAVE_WINSOCK_H 1 #define HAVE_IO_H 1 -#define open _open -#define close _close +#define open _open +#define close _close + +/* Needed for zlib, according to http://www.winimage.com/zLibDll/ */ +/*#define ZLIB_DLL 1 +#define _WINDOWS 1*/ |