diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-19 00:44:40 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-19 00:44:40 +0200 |
| commit | 63b452acce14b8d0d6e80b295a162172339df5b1 (patch) | |
| tree | 1eb9144eb88e76b2ca3bcd007854c7ef94736848 | |
| parent | 112fcfe05f71f990305a41e3db532e667f819aad (diff) | |
makeinc cleanup
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | src/makeinc.skel | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/config.h b/config.h index 1907186f..70eafe27 100644 --- a/config.h +++ b/config.h @@ -10,8 +10,5 @@ #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL -#ifndef USE_IPV6 -#define socklen_t int -#endif #define GETTEXT_PACKAGE "xchat" #define PACKAGE_TARNAME "xchat-2.8.8" diff --git a/src/makeinc.skel b/src/makeinc.skel index 753d88b3..6a679141 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,12 +1,9 @@ -#X64 = YES -IPV6 = YES - CC = cl LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL +CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 CPPFLAGS = /c /MD /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo -LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib +LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib !ifdef X64 ############################################################# @@ -64,13 +61,6 @@ PYTHONOUTPUT = xcpython.dll TCLLIB = tcl85 TCLOUTPUT = xctcl.dll -!ifdef IPV6 -CFLAGS = $(CFLAGS) -DUSE_IPV6 -LIBS = $(LIBS) ws2_32.lib -!else -LIBS = $(LIBS) wsock32.lib -!endif - COMMON_OBJECTS = \ cfgfiles.obj \ chanopt.obj \ |