diff options
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | src/char/Makefile | 4 | ||||
| -rw-r--r-- | src/char_sql/Makefile | 3 | ||||
| -rw-r--r-- | src/login/Makefile | 3 | ||||
| -rw-r--r-- | src/login_sql/Makefile | 3 | ||||
| -rw-r--r-- | src/map/Makefile | 6 |
7 files changed, 11 insertions, 22 deletions
diff --git a/Changelog.txt b/Changelog.txt index a19c569b6..fe9f243f2 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4,8 +4,6 @@ SVN: $Rev$ Date Added 12/29 - * Modified the build system to include SVN revision as a #define - as well as in the executable name (SVN 871) [MouseJstr] * Fix account register wipe issue (SVN 868) [MouseJstr] * Double storage/lag exploit fixed (SVN 867) [MouseJstr] * Another -1 alive_timer fix (SVN 866) [MouseJstr] @@ -26,15 +26,13 @@ endif OPT = -g -O2 -ffast-math -SVN_VERSION = $(shell echo " $Rev$ " | sed -e 's/^.* \(.*\) .*/\1/') - ifeq ($(findstring CYGWIN,$(PLATFORM)), CYGWIN) OS_TYPE = -DCYGWIN -CFLAGS = -DSVN_VERSION=$(SVN_VERSION) $(OPT) -Wall -DFD_SETSIZE=4096 -I../common $(PACKETDEF) $(OS_TYPE) +CFLAGS = $(OPT) -Wall -DFD_SETSIZE=4096 -I../common $(PACKETDEF) $(OS_TYPE) else OS_TYPE = -CFLAGS = -DSVN_VERSION=$(SVN_VERSION) $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE) -# CFLAGS = -DTWILIGHT -DSVN_VERSION=$(SVN_VERSION) $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE) +CFLAGS = $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE) +# CFLAGS = -DTWILIGHT $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE) endif MYSQLFLAG_INCLUDE_DEFAULT = /usr/local/include/mysql @@ -69,11 +67,11 @@ else LIB_S = $(LIB_S_DEFAULT) endif -MYLIB = SVN_VERSION="$(SVN_VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS) $(MYSQLFLAG_INCLUDE)" LIB_S="$(LIB_S) $(GCLIB)" +MYLIB = CC="$(CC)" CFLAGS="$(CFLAGS) $(MYSQLFLAG_INCLUDE)" LIB_S="$(LIB_S) $(GCLIB)" endif -MKDEF = SVN_VERSION="$(SVN_VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" LIB_S="$(GCLIB)" +MKDEF = CC="$(CC)" CFLAGS="$(CFLAGS)" LIB_S="$(GCLIB)" all: conf txt diff --git a/src/char/Makefile b/src/char/Makefile index 740d2608f..877f83c5a 100644 --- a/src/char/Makefile +++ b/src/char/Makefile @@ -4,9 +4,7 @@ txt: char-server COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o ../common/showmsg.o ../common/strlib.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/showmsg.h ../common/strlib.h char-server: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) $> - cp ../../$@-$(SVN_VERSION) ../../$@ - + $(CC) -o ../../$@ $> char.o: char.c char.h inter.h int_pet.h $(COMMON_H) ../common/version.h inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h char.h $(COMMON_H) diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile index 10d08e2a9..e206dd211 100644 --- a/src/char_sql/Makefile +++ b/src/char_sql/Makefile @@ -5,8 +5,7 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db. COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o itemdb.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) $^ $(LIB_S) - cp ../../$@-$(SVN_VERSION) ../../$@ + $(CC) -o ../../$@ $^ $(LIB_S) char.o: char.c char.h ../common/strlib.h itemdb.h ../common/showmsg.h inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h diff --git a/src/login/Makefile b/src/login/Makefile index ef3907161..191a015cb 100644 --- a/src/login/Makefile +++ b/src/login/Makefile @@ -5,8 +5,7 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db. 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/showmsg.h ../common/strlib.h login-server: login.o md5calc.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) login.o md5calc.o $(COMMON_OBJ) - cp ../../$@-$(SVN_VERSION) ../../$@ + $(CC) -o ../../$@ login.o md5calc.o $(COMMON_OBJ) login.o: login.c login.h md5calc.h $(COMMON_H) md5calc.o: md5calc.c md5calc.h diff --git a/src/login_sql/Makefile b/src/login_sql/Makefile index 933acc0ee..18b023fe6 100644 --- a/src/login_sql/Makefile +++ b/src/login_sql/Makefile @@ -6,8 +6,7 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db. COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h login-server_sql: login.o md5calc.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) $^ $(LIB_S) - cp ../../$@-$(SVN_VERSION) ../../$@ + $(CC) -o ../../$@ $^ $(LIB_S) login.o: login.c login.h md5calc.h $(COMMON_H) md5calc.o: md5calc.c md5calc.h diff --git a/src/map/Makefile b/src/map/Makefile index 6ac47838c..0dddf6132 100644 --- a/src/map/Makefile +++ b/src/map/Makefile @@ -14,12 +14,10 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grf LIBS = -lz -lm map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/charcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o txtobj/log.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) $> $(LIBS) - cp ../../$@-$(SVN_VERSION) ../../$@ + $(CC) -o ../../$@ $> $(LIBS) map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/charcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o sqlobj/log.o $(COMMON_OBJ) - $(CC) -o ../../$@-$(SVN_VERSION) $> $(LIB_S) - cp ../../$@-$(SVN_VERSION) ../../$@ + $(CC) -o ../../$@ $> $(LIB_S) txtobj/%.o: %.c $(COMPILE.c) -DTXT_ONLY $(OUTPUT_OPTION) $< |