TXT reference removal from emulator.

- Removed any remaining TXT and SQL references from files.
- The 'make sql' command is now replaced by 'make server'.
- Removed account.engine feature as it is no longer needed.
- Moved login and IP ban configs to inter_athena.conf.
- Cleaned up cmake files.
- Miscellaneous clean ups.
This commit is contained in:
aleos89
2014-09-03 17:44:35 -04:00
parent 3c24f458ce
commit 2d2991a1fd
66 changed files with 1152 additions and 1251 deletions

View File

@@ -3,25 +3,25 @@
HAVE_MYSQL=@HAVE_MYSQL@
OMAP=@OMAP@
ifeq ($(HAVE_MYSQL),yes)
ALL_DEPENDS=sql tools
SQL_DEPENDS=common_sql login char map import
COMMON_SQL_DEPENDS=mt19937ar libconfig
LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql
CHAR_SQL_DEPENDS=mt19937ar libconfig common_sql
MAP_SQL_DEPENDS=mt19937ar libconfig common_sql
ALL_DEPENDS=server tools
SERVER_DEPENDS=common login char map import
COMMON_DEPENDS=mt19937ar libconfig
LOGIN_DEPENDS=mt19937ar libconfig common
CHAR_DEPENDS=mt19937ar libconfig common
MAP_DEPENDS=mt19937ar libconfig common
else
ALL_DEPENDS=needs_mysql
SQL_DEPENDS=needs_mysql
COMMON_SQL_DEPENDS=needs_mysql
LOGIN_SQL_DEPENDS=needs_mysql
CHAR_SQL_DEPENDS=needs_mysql
MAP_SQL_DEPENDS=needs_mysql
SERVER_DEPENDS=needs_mysql
COMMON_DEPENDS=needs_mysql
LOGIN_DEPENDS=needs_mysql
CHAR_DEPENDS=needs_mysql
MAP_DEPENDS=needs_mysql
endif
#####################################################################
.PHONY: all sql \
common_sql \
.PHONY: all server \
common \
mt19937ar \
login \
char \
@@ -34,19 +34,22 @@ endif
all: $(ALL_DEPENDS)
sql: $(SQL_DEPENDS)
sql:
@echo "-!- 'make sql' is now deprecated. Please run 'make server' to continue. -!-"
common_sql: $(COMMON_SQL_DEPENDS)
@$(MAKE) -C src/common sql
server: $(SERVER_DEPENDS)
login: $(LOGIN_SQL_DEPENDS)
@$(MAKE) -C src/login sql
common: $(COMMON_DEPENDS)
@$(MAKE) -C src/common server
char: $(CHAR_SQL_DEPENDS)
login: $(LOGIN_DEPENDS)
@$(MAKE) -C src/login server
char: $(CHAR_DEPENDS)
@$(MAKE) -C src/char
map: $(MAP_SQL_DEPENDS)
@$(MAKE) -C src/map sql
map: $(MAP_DEPENDS)
@$(MAKE) -C src/map server
mt19937ar:
@$(MAKE) -C 3rdparty/mt19937ar
@@ -86,18 +89,18 @@ clean:
@$(MAKE) -C src/test $@
help:
@echo "most common targets are 'all' 'sql' 'conf' 'clean' 'help'"
@echo "most common targets are 'all' 'server' 'conf' 'clean' 'help'"
@echo "possible targets are:"
@echo "'common_sql' - builds object files used in SQL servers"
@echo "'common' - builds object files used for the three servers"
@echo "'mt19937ar' - builds object file of Mersenne Twister MT19937"
@echo "'libconfig' - builds object files of libconfig"
@echo "'login' - builds login server"
@echo "'char' - builds char server"
@echo "'map' - builds map server"
@echo "'map' - builds map server"
@echo "'tools' - builds all the tools in src/tools"
@echo "'import' - builds conf/import, conf/msg_conf/import and db/import folders from their template folders (x-tmpl)"
@echo "'all' - builds all the above targets"
@echo "'sql' - builds servers (targets 'common_sql' 'login' 'char' 'map' and 'import')"
@echo "'server' - builds servers (targets 'common' 'login' 'char' 'map' and 'import')"
@echo "'test' - builds tests"
@echo "'clean' - cleans builds and objects"
@echo "'install' - run installer wich setup rathena in /opt/"