diff options
| author | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-03 20:42:30 +0000 |
|---|---|---|
| committer | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-03 20:42:30 +0000 |
| commit | 90a104887fd668d38feafdebb0b494ceac7b9066 (patch) | |
| tree | 2a29a377dbc3daf44bd6a652da4dace2b12c26b6 | |
| parent | bce7e0c15e163d0a05f05ab997478dde4969a84b (diff) | |
Remove MARK_DEPRECATED from some stuff, it makes development a bit too noisy.
Fix a makefile I broke with SQL removal.
Add InspIRCd 1.2 module to build.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1507 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | include/extern.h | 6 | ||||
| -rw-r--r-- | src/protocol/Makefile | 3 | ||||
| -rw-r--r-- | src/protocol/Makefile.sub | 3 | ||||
| -rw-r--r-- | src/protocol/Makefile.win32 | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/include/extern.h b/include/extern.h index 065cd5ab1..b84d2dc9f 100644 --- a/include/extern.h +++ b/include/extern.h @@ -847,9 +847,9 @@ E void notice_server(char *source, Server * s, const char *fmt, ...) E void notice_user(char *source, User *u, const char *fmt, ...) FORMAT(printf,3,4); -E void notice_list(const char *source, const char *dest, char **text) MARK_DEPRECATED; -E void notice_lang(const char *source, User *dest, int message, ...) MARK_DEPRECATED; -E void notice_help(const char *source, User *dest, int message, ...) MARK_DEPRECATED; +E void notice_list(const char *source, const char *dest, char **text); // MARK_DEPRECATED; +E void notice_lang(const char *source, User *dest, int message, ...); // MARK_DEPRECATED; +E void notice_help(const char *source, User *dest, int message, ...); // MARK_DEPRECATED; /**** servers.c ****/ diff --git a/src/protocol/Makefile b/src/protocol/Makefile index 96e63739d..366e8ebb1 100644 --- a/src/protocol/Makefile +++ b/src/protocol/Makefile @@ -23,6 +23,9 @@ distclean: clean spotless .c.o: @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< +.cpp.o: + @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< + .o.s: @../../run-cc.pl $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} @$(TOUCH) $*.s diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub index a2d6a414a..9fd25dc0c 100644 --- a/src/protocol/Makefile.sub +++ b/src/protocol/Makefile.sub @@ -18,6 +18,9 @@ distclean: spotless .c.o: $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< +.cpp.o: + $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< + so: $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32 index 3a71ff2ff..8383c828c 100644 --- a/src/protocol/Makefile.win32 +++ b/src/protocol/Makefile.win32 @@ -1,6 +1,6 @@ include ../../Makefile.inc.win32 -SRCS=bahamut.c charybdis.c inspircd11.c \ +SRCS=bahamut.c charybdis.c inspircd11.c inspircd12.cpp \ ratbox.c shadowircd.c unreal32.c OBJECTS= $(SRCS:.c=.dll) @@ -14,6 +14,9 @@ distclean: clean spotless .c.dll: $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS) +.cpp.dll: + $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS) + clean: -@del *.obj |