* Updated configure/make scripts to resolve various issues.
- Added detection whether or not -fPIC switch is required when compiling shared objects (plug-ins) to resolve compile issues on 64-bit platforms (topic:208746). - Native 'strnlen' implementations are now detected and disable the one in strlib (bugreport:1261). - Define 'DB_MANUAL_CAST_TO_UNION' is now set when necessary (bugreport:1261). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14708 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
18
Makefile.in
18
Makefile.in
@@ -2,7 +2,7 @@
|
||||
|
||||
HAVE_MYSQL=@HAVE_MYSQL@
|
||||
ifeq ($(HAVE_MYSQL),yes)
|
||||
ALL_DEPENDS=common common_sql login login_sql char char_sql map map_sql tools converters plugins import save
|
||||
ALL_DEPENDS=common common_sql login login_sql char char_sql map map_sql tools converters import save
|
||||
SQL_DEPENDS=common_sql login_sql char_sql map_sql import save
|
||||
COMMON_SQL_DEPENDS=
|
||||
LOGIN_SQL_DEPENDS=common_sql
|
||||
@@ -10,7 +10,7 @@ ifeq ($(HAVE_MYSQL),yes)
|
||||
MAP_SQL_DEPENDS=common_sql
|
||||
CONVERTERS_DEPENDS=common_sql
|
||||
else
|
||||
ALL_DEPENDS=common login char map tools plugins import save
|
||||
ALL_DEPENDS=common login char map tools import save
|
||||
SQL_DEPENDS=needs_mysql
|
||||
COMMON_SQL_DEPENDS=needs_mysql
|
||||
LOGIN_SQL_DEPENDS=needs_mysql
|
||||
@@ -19,6 +19,14 @@ else
|
||||
CONVERTERS_DEPENDS=needs_mysql
|
||||
endif
|
||||
|
||||
WITH_PLUGINS=@WITH_PLUGINS@
|
||||
ifeq ($(WITH_PLUGINS),yes)
|
||||
ALL_DEPENDS+=plugins
|
||||
PLUGIN_DEPENDS=common
|
||||
else
|
||||
PLUGIN_DEPENDS=no_plugins
|
||||
endif
|
||||
|
||||
#####################################################################
|
||||
.PHONY: txt sql conf \
|
||||
common common_sql \
|
||||
@@ -66,7 +74,7 @@ tools:
|
||||
converters: $(CONVERTERS_DEPENDS)
|
||||
@$(MAKE) -C src/txt-converter
|
||||
|
||||
plugins addons: common
|
||||
plugins addons: $(PLUGIN_DEPENDS)
|
||||
@$(MAKE) -C src/plugins
|
||||
|
||||
import:
|
||||
@@ -129,6 +137,10 @@ needs_mysql:
|
||||
@echo "MySQL not found or disabled by the configure script"
|
||||
@exit 1
|
||||
|
||||
no_plugins:
|
||||
@echo "Plugins disabled by the configure script"
|
||||
@exit 1
|
||||
|
||||
#####################################################################
|
||||
# TODO
|
||||
|
||||
|
||||
Reference in New Issue
Block a user