diff options
| author | MadCamel <madcamel@gmail.com> | 2010-10-08 05:47:49 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2010-10-08 05:47:49 -0400 |
| commit | 5cfb10a69c03979d1d3f246ba1babf3ba92df178 (patch) | |
| tree | 7ea03cab10f893374852041a6a13d1711525edd8 | |
| parent | 21d38a6bfc3bcfa8c115df26847b7c2b4d986565 (diff) | |
| download | tmwa-5cfb10a69c03979d1d3f246ba1babf3ba92df178.tar.gz tmwa-5cfb10a69c03979d1d3f246ba1babf3ba92df178.tar.bz2 tmwa-5cfb10a69c03979d1d3f246ba1babf3ba92df178.tar.xz tmwa-5cfb10a69c03979d1d3f246ba1babf3ba92df178.zip | |
Moved md5calc.c from login-server to the common library
| -rw-r--r-- | src/common/Makefile | 3 | ||||
| -rw-r--r-- | src/common/md5calc.c (renamed from src/login/md5calc.c) | 2 | ||||
| -rw-r--r-- | src/common/md5calc.h (renamed from src/login/md5calc.h) | 0 | ||||
| -rw-r--r-- | src/login/Makefile | 11 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/common/Makefile b/src/common/Makefile index 9eac7b4..27930bd 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -1,5 +1,5 @@ include ../../make.defs -txt sql all: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o malloc.o mt_rand.o +txt sql all: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o malloc.o mt_rand.o md5calc.o core.o: core.c core.h socket.o: socket.c socket.h mmo.h @@ -10,6 +10,7 @@ lock.o: lock.h nullpo.o: nullpo.c nullpo.h malloc.o: malloc.c malloc.h mt_rand.o: mt_rand.c mt_rand.h +md5calc.o: md5calc.c md5calc.h clean: rm -f *.o diff --git a/src/login/md5calc.c b/src/common/md5calc.c index cf9d958..2eea918 100644 --- a/src/login/md5calc.c +++ b/src/common/md5calc.c @@ -11,6 +11,7 @@ #include <string.h> #include <stdio.h> #include "mt_rand.h" +#include <netinet/in.h> #ifndef UINT_MAX #define UINT_MAX 4294967295U @@ -331,3 +332,4 @@ int pass_ok(const char *password, const char *crypted) { return(0); } + diff --git a/src/login/md5calc.h b/src/common/md5calc.h index 3571466..3571466 100644 --- a/src/login/md5calc.h +++ b/src/common/md5calc.h diff --git a/src/login/Makefile b/src/login/Makefile index 4b65c33..32e14d7 100644 --- a/src/login/Makefile +++ b/src/login/Makefile @@ -3,13 +3,12 @@ include ../../make.defs all: login-server txt: login-server -COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o ../common/mt_rand.o -COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/lock.h ../common/malloc.h ../common/mt_rand.h +COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o ../common/mt_rand.o ../common/md5calc.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/lock.h ../common/malloc.h ../common/mt_rand.h ../common/md5calc.h -login-server: login.o md5calc.o $(COMMON_OBJ) - $(CC) $(CFLAGS) -o ../../$@ login.o md5calc.o $(COMMON_OBJ) -login.o: login.c login.h md5calc.h $(COMMON_H) -md5calc.o: md5calc.c md5calc.h +login-server: login.o $(COMMON_OBJ) + $(CC) $(CFLAGS) -o ../../$@ login.o $(COMMON_OBJ) +login.o: login.c login.h $(COMMON_H) clean: rm -f *.o ../../login-server |