From 51e87379c9d532cafc98b96178709b8b8c88e1ae Mon Sep 17 00:00:00 2001 From: MadCamel Date: Wed, 5 May 2010 07:34:05 -0400 Subject: Fixed up and slightly simplified the build system It's now possible to run 'make' in any of the src/ subdirs and have it build properly. Moved some tools including eathena-monitor to src/tools - run 'make tools' to build. CFLAGS, etc are now in the 'make.defs' file. Requires GNU make. --- src/char/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/char') diff --git a/src/char/Makefile b/src/char/Makefile index 841edfd..271aafd 100644 --- a/src/char/Makefile +++ b/src/char/Makefile @@ -1,10 +1,12 @@ +include ../../make.defs + all: char-server txt: char-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/db.h ../common/lock.h ../common/timer.h ../common/malloc.h ../common/mt_rand.h char-server: char.o inter.o int_party.o int_guild.o int_storage.o $(COMMON_OBJ) - $(CC) -o ../../$@ $> + $(CC) $(CFLAGS) -o ../../$@ $> char.o: char.c char.h inter.h $(COMMON_H) ../common/version.h inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h char.h $(COMMON_H) -- cgit v1.2.3-70-g09d2