Merged TXT removal branch back to trunk.

* TXT save engine is removed and no longer supported.
* See also tid:53926, tid:57717.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15503 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 35 insertions, 18 deletions

diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 1fd54b20b..e96113f0e 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -14,41 +14,58 @@ MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
 MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h
 MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar
 
-CHAR_OBJ = obj_txt/char.o obj_txt/inter.o obj_txt/int_party.o obj_txt/int_guild.o \
-	obj_txt/int_storage.o obj_txt/int_status.o obj_txt/int_pet.o obj_txt/int_homun.o
-CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_status.h int_pet.h int_homun.h
+COMMON_SQL_OBJ = ../common/obj_sql/sql.o
+COMMON_H = ../common/sql.h
+
+CHAR_OBJ = obj_sql/char.o obj_sql/inter.o obj_sql/int_party.o obj_sql/int_guild.o \
+	obj_sql/int_storage.o obj_sql/int_pet.o obj_sql/int_homun.o obj_sql/int_mail.o obj_sql/int_auction.o obj_sql/int_quest.o obj_sql/int_mercenary.o
+CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_pet.h int_homun.h int_mail.h int_auction.h int_quest.h int_mercenary.h
+
+HAVE_MYSQL=@HAVE_MYSQL@
+ifeq ($(HAVE_MYSQL),yes)
+	CHAR_SERVER_SQL_DEPENDS=obj_sql $(CHAR_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) $(MT19937AR_OBJ)
+else
+	CHAR_SERVER_SQL_DEPENDS=needs_mysql
+endif
 
 @SET_MAKE@
 
 #####################################################################
-.PHONY : all char-server clean help
+.PHONY : all char-server_sql clean help
 
-all: char-server
+all: char-server_sql
 
-char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ) $(MT19937AR_OBJ)
-	@CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) $(MT19937AR_OBJ) @LIBS@
+char-server_sql: $(CHAR_SERVER_SQL_DEPENDS)
+	@CC@ @LDFLAGS@ -o ../../char-server_sql@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) $(MT19937AR_OBJ) @LIBS@ @MYSQL_LIBS@
 
 clean:
-	rm -rf *.o obj_txt ../../char-server@EXEEXT@
+	rm -rf *.o obj_sql ../../char-server_sql@EXEEXT@
 
 help:
-	@echo "possible targets are 'char-server' 'all' 'clean' 'help'"
-	@echo "'char-server'  - char server (TXT version)"
-	@echo "'all'          - builds all above targets"
-	@echo "'clean'        - cleans builds and objects"
-	@echo "'help'         - outputs this message"
+	@echo "possible targets are 'char-server_sql' 'all' 'clean' 'help'"
+	@echo "'char-server_sql'  - char server (SQL version)"
+	@echo "'all'              - builds all above targets"
+	@echo "'clean'            - cleans builds and objects"
+	@echo "'help'             - outputs this message"
 
 #####################################################################
 
-obj_txt:
-	-mkdir obj_txt
+needs_mysql:
+	@echo "MySQL not found or disabled by the configure script"
+	@exit 1
 
-obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H) $(MT19937AR_H)
-	@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+obj_sql:
+	-mkdir obj_sql
+
+obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H)
+	@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
 # missing object files
 ../common/obj_all/%.o:
-	@$(MAKE) -C ../common txt
+	@$(MAKE) -C ../common sql
+
+../common/obj_sql/%.o:
+	@$(MAKE) -C ../common sql
 
 MT19937AR_OBJ:
 	@$(MAKE) -C ../../3rdparty/mt19937ar