From 94cf3fe71676593dcc4abe06d06c274a018928d7 Mon Sep 17 00:00:00 2001 From: mc_cameri Date: Sun, 5 Dec 2004 12:20:33 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@462 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Makefile | 8 ++++++++ src/common/showmsg.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d10624e52..2b06f38afb 100644 --- a/Makefile +++ b/Makefile @@ -110,10 +110,16 @@ clean: src/common/GNUmakefile src/login/GNUmakefile src/char/GNUmakefile src/map cd src ; cd ladmin ; $(MAKE) $(MKDEF) $@ ; cd .. cd src ; cd txt-converter ; cd login ; $(MAKE) $(MKLIB) $@ ; cd .. cd src ; cd txt-converter ; cd char ; $(MAKE) $(MKLIB) $@ ; cd .. + cd src ; cd webserver; $(MAKE) $(MKDEF) $@ ; cd .. tools: cd tool && $(MAKE) $(MKDEF) && cd .. $(CC) -o setupwizard setupwizard.c +webserver: + cd src ; cd webserver ; $(MAKE) $(MKDEF) $@ ; cd .. + +#webserver: src/webserver/GNUmakefile + src/common/GNUmakefile: src/common/Makefile sed -e 's/$$>/$$^/' src/common/Makefile > src/common/GNUmakefile @@ -133,3 +139,5 @@ src/txt-converter/login/GNUmakefile: src/txt-converter/login/Makefile sed -e 's/$$>/$$^/' src/txt-converter/login/Makefile > src/txt-converter/login/GNUmakefile src/txt-converter/char/GNUmakefile: src/txt-converter/char/Makefile sed -e 's/$$>/$$^/' src/txt-converter/char/Makefile > src/txt-converter/char/GNUmakefile +src/webserver/GNUmakefile: src/webserver/Makefile + sed -e 's/$$>/$$^/' src/webserver/Makefile > src/webserver/GNUmakefile \ No newline at end of file diff --git a/src/common/showmsg.h b/src/common/showmsg.h index 03ffe310b5..1c4a2dfcb6 100644 --- a/src/common/showmsg.h +++ b/src/common/showmsg.h @@ -10,7 +10,7 @@ extern int _ShowMessage(const char *string, enum msg_type flag); /* MSG_XX */ #define ShowMsg(string,flag) _ShowMessage(string,flag) // #define DisplayMsg(string,flag) _ShowMessage(string,flag) -// #define ShowMessage(string,flag) _ShowMessage(string,flag) + #define ShowMessage(string,flag) _ShowMessage(string,flag) /* MSG_STATUS */ #define ShowStatus(string) _ShowMessage(string,MSG_STATUS)