summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore20
-rw-r--r--Hercules-10.sln6
-rw-r--r--Hercules-12.sln6
-rw-r--r--Hercules-9.sln6
-rwxr-xr-xathena-start6
-rwxr-xr-xchar-server.bat (renamed from charserv-sql.bat)0
-rw-r--r--char-server.sh6
-rwxr-xr-xlogin-server.bat (renamed from logserv-sql.bat)0
-rw-r--r--login-server.sh6
-rwxr-xr-xmap-server.bat (renamed from mapserv-sql.bat)0
-rw-r--r--map-server.sh6
-rwxr-xr-xrun-server.bat (renamed from runserver-sql.bat)0
-rwxr-xr-xserv.bat4
-rw-r--r--src/char/CMakeLists.txt16
-rw-r--r--src/char/Makefile.in14
-rw-r--r--src/login/Makefile.in8
-rw-r--r--src/login/sql/CMakeLists.txt18
-rw-r--r--src/map/Makefile.in8
-rw-r--r--src/map/sql/CMakeLists.txt18
-rw-r--r--vcproj-10/char-server.vcxproj (renamed from vcproj-10/char-server_sql.vcxproj)0
-rw-r--r--vcproj-10/char-server.vcxproj.filters (renamed from vcproj-10/char-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-10/login-server.vcxproj (renamed from vcproj-10/login-server_sql.vcxproj)0
-rw-r--r--vcproj-10/login-server.vcxproj.filters (renamed from vcproj-10/login-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-10/map-server.vcxproj (renamed from vcproj-10/map-server_sql.vcxproj)0
-rw-r--r--vcproj-10/map-server.vcxproj.filters (renamed from vcproj-10/map-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-12/char-server.vcxproj (renamed from vcproj-12/char-server_sql.vcxproj)0
-rw-r--r--vcproj-12/char-server.vcxproj.filters (renamed from vcproj-12/char-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-12/login-server.vcxproj (renamed from vcproj-12/login-server_sql.vcxproj)0
-rw-r--r--vcproj-12/login-server.vcxproj.filters (renamed from vcproj-12/login-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-12/map-server.vcxproj (renamed from vcproj-12/map-server_sql.vcxproj)0
-rw-r--r--vcproj-12/map-server.vcxproj.filters (renamed from vcproj-12/map-server_sql.vcxproj.filters)0
-rw-r--r--vcproj-9/char-server.vcproj (renamed from vcproj-9/char-server_sql.vcproj)0
-rw-r--r--vcproj-9/login-server.vcproj (renamed from vcproj-9/login-server_sql.vcproj)0
-rw-r--r--vcproj-9/map-server.vcproj (renamed from vcproj-9/map-server_sql.vcproj)0
34 files changed, 80 insertions, 68 deletions
diff --git a/.gitignore b/.gitignore
index 447365f22..7d981021d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,17 +13,20 @@
/*.sdf
/*.stackdump
/*.suo
-/char-server_sql
+/char-server
/config.log
/config.status
/core
/ipch
-/login-server_sql
+/login-server
/Makefile
/Makefile.cache
-/map-server_sql
+/map-server
/mapcache
+#OSX Xcode project user-sensitive-stuff
+/Hercules
+
# /3rdparty/libconfig/
/3rdparty/libconfig/Makefile
/3rdparty/libconfig/*.o
@@ -37,7 +40,7 @@
# /log/
/log/*.log
-/log/map-server_sql.leaks
+/log/*.leaks
# /src/char/
/src/char/Makefile
@@ -76,6 +79,9 @@
/tools/*.pdb
# /vcproj-12/
+/vcproj-12/map-server
+/vcproj-12/char-server
+/vcproj-12/login-server
/vcproj-12/char-server_sql
/vcproj-12/login-server_sql
/vcproj-12/mapcache
@@ -83,6 +89,9 @@
/vcproj-12/*.user
# /vcproj-10/
+/vcproj-10/map-server
+/vcproj-10/char-server
+/vcproj-10/login-server
/vcproj-10/char-server_sql
/vcproj-10/login-server_sql
/vcproj-10/mapcache
@@ -91,6 +100,9 @@
# /vcproj-9/
/vcproj-9/*.user
+/vcproj-9/char-server
+/vcproj-9/login-server
+/vcproj-9/map-server
/vcproj-9/char-server_sql
/vcproj-9/login-server_sql
/vcproj-9/map-server_sql
diff --git a/Hercules-10.sln b/Hercules-10.sln
index ea8847037..a740ee0b1 100644
--- a/Hercules-10.sln
+++ b/Hercules-10.sln
@@ -1,10 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-10\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-10\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-10\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-10\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-10\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-10\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject
diff --git a/Hercules-12.sln b/Hercules-12.sln
index e38ab4cbd..4f271290f 100644
--- a/Hercules-12.sln
+++ b/Hercules-12.sln
@@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-12\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-12\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-12\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject
diff --git a/Hercules-9.sln b/Hercules-9.sln
index 8ea06598a..7159e3f7f 100644
--- a/Hercules-9.sln
+++ b/Hercules-9.sln
@@ -1,10 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-9\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-9\char-server.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-9\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-9\login-server.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-9\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-9\map-server.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
EndProject
diff --git a/athena-start b/athena-start
index 2b9fcc38e..eb3dbdf5a 100755
--- a/athena-start
+++ b/athena-start
@@ -4,9 +4,9 @@
PATH=./:$PATH
-L_SRV=login-server_sql
-C_SRV=char-server_sql
-M_SRV=map-server_sql
+L_SRV=login-server
+C_SRV=char-server
+M_SRV=map-server
print_start() {
# more << EOF
diff --git a/charserv-sql.bat b/char-server.bat
index c88168475..c88168475 100755
--- a/charserv-sql.bat
+++ b/char-server.bat
diff --git a/char-server.sh b/char-server.sh
index 9e7e6840a..9f4bf41b1 100644
--- a/char-server.sh
+++ b/char-server.sh
@@ -5,10 +5,10 @@ ulimit -Sc unlimited
while [ 3 ] ; do
if [ -f .stopserver3 ] ; then
-echo server marked down >> servlog.txt
+echo server marked down >> server-log.txt
else
-echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> startlog.txt
-./char-server_sql
+echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> start-log.txt
+./char-server
fi
sleep 5
diff --git a/logserv-sql.bat b/login-server.bat
index e38daa6d5..e38daa6d5 100755
--- a/logserv-sql.bat
+++ b/login-server.bat
diff --git a/login-server.sh b/login-server.sh
index 5cddb968a..45990a645 100644
--- a/login-server.sh
+++ b/login-server.sh
@@ -5,10 +5,10 @@ ulimit -Sc unlimited
while [ 2 ] ; do
if [ -f .stopserver2 ] ; then
-echo server marked down >> servlog.txt
+echo server marked down >> server-log.txt
else
-echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> startlog.txt
-./login-server_sql
+echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> start-log.txt
+./login-server
fi
sleep 5
diff --git a/mapserv-sql.bat b/map-server.bat
index 9938a25f1..9938a25f1 100755
--- a/mapserv-sql.bat
+++ b/map-server.bat
diff --git a/map-server.sh b/map-server.sh
index d1acd8f69..0a9cdd00d 100644
--- a/map-server.sh
+++ b/map-server.sh
@@ -5,10 +5,10 @@ ulimit -Sc unlimited
while [ 1 ] ; do
if [ -f .stopserver ] ; then
-echo server marked down >> servlog.txt
+echo server marked down >> server-log.txt
else
-echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> startlog.txt
-./map-server_sql
+echo restarting server at time at `date +"%m-%d-%H:%M-%S"`>> start-log.txt
+./map-server
fi
sleep 5
diff --git a/runserver-sql.bat b/run-server.bat
index f111acf46..f111acf46 100755
--- a/runserver-sql.bat
+++ b/run-server.bat
diff --git a/serv.bat b/serv.bat
index 6e8037faa..cc7d37e20 100755
--- a/serv.bat
+++ b/serv.bat
@@ -47,8 +47,8 @@ ECHO %2 has crashed!
GOTO RESTART_NT
:DIRECT
-ECHO Do not run this file directly. It is used by logserv.bat, charserv.bat,
-ECHO mapserv.bat and their '-sql' counterparts.
+ECHO Do not run this file directly. It is used by login-server.bat, char-server.bat,
+ECHO and map-server.bat
GOTO END
:NOTFOUND
diff --git a/src/char/CMakeLists.txt b/src/char/CMakeLists.txt
index 22b793bef..8c71a3b4c 100644
--- a/src/char/CMakeLists.txt
+++ b/src/char/CMakeLists.txt
@@ -9,7 +9,7 @@ set( SQL_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" )
# char sql
#
if( BUILD_SQL_SERVERS )
-message( STATUS "Creating target char-server_sql" )
+message( STATUS "Creating target char-server" )
set( SQL_CHAR_HEADERS
"${CMAKE_CURRENT_SOURCE_DIR}/char.h"
"${CMAKE_CURRENT_SOURCE_DIR}/int_auction.h"
@@ -46,15 +46,15 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_CHAR_HEADER
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( char FILES ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
-add_executable( char-server_sql ${SOURCE_FILES} )
-add_dependencies( char-server_sql ${DEPENDENCIES} )
-target_link_libraries( char-server_sql ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( char-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+add_executable( char-server ${SOURCE_FILES} )
+add_dependencies( char-server ${DEPENDENCIES} )
+target_link_libraries( char-server ${LIBRARIES} ${DEPENDENCIES} )
+set_target_properties( char-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
- cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server_sql" GROUP Runtime )
- install( TARGETS char-server_sql
+ cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server" GROUP Runtime )
+ install( TARGETS char-server
DESTINATION "."
COMPONENT Runtime_charserver_sql )
endif( INSTALL_COMPONENT_RUNTIME )
-message( STATUS "Creating target char-server_sql - done" )
+message( STATUS "Creating target char-server - done" )
endif( BUILD_SQL_SERVERS )
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index bfe9d1585..a64145dea 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -29,21 +29,21 @@ endif
@SET_MAKE@
#####################################################################
-.PHONY : all char-server_sql clean help
+.PHONY : all char-server clean help
-all: char-server_sql
+all: char-server
-char-server_sql: $(CHAR_SERVER_SQL_DEPENDS)
+char-server: $(CHAR_SERVER_SQL_DEPENDS)
@echo " LD $@"
- @@CC@ @LDFLAGS@ -o ../../char-server_sql@EXEEXT@ $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
+ @@CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
clean:
@echo " CLEAN char"
- @rm -rf *.o obj_sql ../../char-server_sql@EXEEXT@
+ @rm -rf *.o obj_sql ../../char-server@EXEEXT@
help:
- @echo "possible targets are 'char-server_sql' 'all' 'clean' 'help'"
- @echo "'char-server_sql' - char server (SQL version)"
+ @echo "possible targets are 'char-server' 'all' 'clean' 'help'"
+ @echo "'char-server' - char server (SQL version)"
@echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message"
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index d0fc34756..543b31b93 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -31,11 +31,11 @@ endif
all: sql
-sql: obj_sql login-server_sql
+sql: obj_sql login-server
clean:
@echo " CLEAN login"
- @rm -rf *.o obj_sql ../../login-server@EXEEXT@ ../../login-server_sql@EXEEXT@
+ @rm -rf *.o obj_sql ../../login-server@EXEEXT@ ../../login-server@EXEEXT@
help:
@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@@ -58,9 +58,9 @@ obj_sql:
#executables
-login-server_sql: $(LOGIN_SERVER_SQL_DEPENDS)
+login-server: $(LOGIN_SERVER_SQL_DEPENDS)
@echo " LD $@"
- @@CC@ @LDFLAGS@ -o ../../login-server_sql@EXEEXT@ $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
+ @@CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
# login object files
diff --git a/src/login/sql/CMakeLists.txt b/src/login/sql/CMakeLists.txt
index 1355f17ee..46cf4db02 100644
--- a/src/login/sql/CMakeLists.txt
+++ b/src/login/sql/CMakeLists.txt
@@ -3,7 +3,7 @@
# login sql
#
if( BUILD_SQL_SERVERS )
-message( STATUS "Creating target login-server_sql" )
+message( STATUS "Creating target login-server" )
set( SQL_LOGIN_HEADERS
"${SQL_LOGIN_SOURCE_DIR}/account.h"
"${SQL_LOGIN_SOURCE_DIR}/ipban.h"
@@ -24,16 +24,16 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_LOGIN_HEADE
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( login FILES ${SQL_LOGIN_HEADERS} ${SQL_LOGIN_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
-add_executable( login-server_sql ${SOURCE_FILES} )
-add_dependencies( login-server_sql ${DEPENDENCIES} )
-target_link_libraries( login-server_sql ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( login-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+add_executable( login-server ${SOURCE_FILES} )
+add_dependencies( login-server ${DEPENDENCIES} )
+target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
+set_target_properties( login-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
- cpack_add_component( Runtime_loginserver_sql DESCRIPTION "login-server (sql version)" DISPLAY_NAME "login-server_sql" GROUP Runtime )
- install( TARGETS login-server_sql
+ cpack_add_component( Runtime_loginserver_sql DESCRIPTION "login-server (sql version)" DISPLAY_NAME "login-server" GROUP Runtime )
+ install( TARGETS login-server
DESTINATION "."
COMPONENT Runtime_loginserver_sql )
endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} login-server_sql CACHE INTERNAL "" )
-message( STATUS "Creating target login-server_sql - done" )
+set( TARGET_LIST ${TARGET_LIST} login-server CACHE INTERNAL "" )
+message( STATUS "Creating target login-server - done" )
endif( BUILD_SQL_SERVERS )
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index 8e97221a7..d2c9d63d0 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -32,7 +32,7 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \
HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
ALL_DEPENDS=txt sql
- SQL_DEPENDS=map-server_sql
+ SQL_DEPENDS=map-server
else
ALL_TARGET=txt
SQL_DEPENDS=needs_mysql
@@ -59,7 +59,7 @@ sql: $(SQL_DEPENDS)
clean:
@echo " CLEAN map"
- @rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server_sql@EXEEXT@
+ @rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server@EXEEXT@
help:
ifeq ($(HAVE_MYSQL),yes)
@@ -90,9 +90,9 @@ obj_sql:
# executables
-map-server_sql: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a
+map-server: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a
@echo " LD $@"
- @@CC@ @LDFLAGS@ -o ../../map-server_sql@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
+ @@CC@ @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
# map object files
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt
index 47c8e495c..1d8bd5fe2 100644
--- a/src/map/sql/CMakeLists.txt
+++ b/src/map/sql/CMakeLists.txt
@@ -3,7 +3,7 @@
# map sql
#
if( BUILD_SQL_SERVERS )
-message( STATUS "Creating target map-server_sql" )
+message( STATUS "Creating target map-server" )
set( SQL_MAP_HEADERS
"${SQL_MAP_SOURCE_DIR}/atcommand.h"
"${SQL_MAP_SOURCE_DIR}/battle.h"
@@ -97,16 +97,16 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS
source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
source_group( map FILES ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} )
include_directories( ${INCLUDE_DIRS} )
-add_executable( map-server_sql ${SOURCE_FILES} )
-add_dependencies( map-server_sql ${DEPENDENCIES} )
-target_link_libraries( map-server_sql ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+add_executable( map-server ${SOURCE_FILES} )
+add_dependencies( map-server ${DEPENDENCIES} )
+target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
+set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
if( INSTALL_COMPONENT_RUNTIME )
- cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime )
- install( TARGETS map-server_sql
+ cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server" GROUP Runtime )
+ install( TARGETS map-server
DESTINATION "."
COMPONENT Runtime_mapserver_sql )
endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} map-server_sql CACHE INTERNAL "" )
-message( STATUS "Creating target map-server_sql - done" )
+set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" )
+message( STATUS "Creating target map-server - done" )
endif( BUILD_SQL_SERVERS )
diff --git a/vcproj-10/char-server_sql.vcxproj b/vcproj-10/char-server.vcxproj
index 4900ffc91..4900ffc91 100644
--- a/vcproj-10/char-server_sql.vcxproj
+++ b/vcproj-10/char-server.vcxproj
diff --git a/vcproj-10/char-server_sql.vcxproj.filters b/vcproj-10/char-server.vcxproj.filters
index 06f69e35e..06f69e35e 100644
--- a/vcproj-10/char-server_sql.vcxproj.filters
+++ b/vcproj-10/char-server.vcxproj.filters
diff --git a/vcproj-10/login-server_sql.vcxproj b/vcproj-10/login-server.vcxproj
index a9e693676..a9e693676 100644
--- a/vcproj-10/login-server_sql.vcxproj
+++ b/vcproj-10/login-server.vcxproj
diff --git a/vcproj-10/login-server_sql.vcxproj.filters b/vcproj-10/login-server.vcxproj.filters
index f4280a018..f4280a018 100644
--- a/vcproj-10/login-server_sql.vcxproj.filters
+++ b/vcproj-10/login-server.vcxproj.filters
diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server.vcxproj
index 9d7543e02..9d7543e02 100644
--- a/vcproj-10/map-server_sql.vcxproj
+++ b/vcproj-10/map-server.vcxproj
diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server.vcxproj.filters
index 72ad44246..72ad44246 100644
--- a/vcproj-10/map-server_sql.vcxproj.filters
+++ b/vcproj-10/map-server.vcxproj.filters
diff --git a/vcproj-12/char-server_sql.vcxproj b/vcproj-12/char-server.vcxproj
index 0fb39a79a..0fb39a79a 100644
--- a/vcproj-12/char-server_sql.vcxproj
+++ b/vcproj-12/char-server.vcxproj
diff --git a/vcproj-12/char-server_sql.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters
index 06f69e35e..06f69e35e 100644
--- a/vcproj-12/char-server_sql.vcxproj.filters
+++ b/vcproj-12/char-server.vcxproj.filters
diff --git a/vcproj-12/login-server_sql.vcxproj b/vcproj-12/login-server.vcxproj
index aa766b972..aa766b972 100644
--- a/vcproj-12/login-server_sql.vcxproj
+++ b/vcproj-12/login-server.vcxproj
diff --git a/vcproj-12/login-server_sql.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters
index f4280a018..f4280a018 100644
--- a/vcproj-12/login-server_sql.vcxproj.filters
+++ b/vcproj-12/login-server.vcxproj.filters
diff --git a/vcproj-12/map-server_sql.vcxproj b/vcproj-12/map-server.vcxproj
index b01033971..b01033971 100644
--- a/vcproj-12/map-server_sql.vcxproj
+++ b/vcproj-12/map-server.vcxproj
diff --git a/vcproj-12/map-server_sql.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters
index 72ad44246..72ad44246 100644
--- a/vcproj-12/map-server_sql.vcxproj.filters
+++ b/vcproj-12/map-server.vcxproj.filters
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server.vcproj
index 3933e5c6b..3933e5c6b 100644
--- a/vcproj-9/char-server_sql.vcproj
+++ b/vcproj-9/char-server.vcproj
diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server.vcproj
index a8d633997..a8d633997 100644
--- a/vcproj-9/login-server_sql.vcproj
+++ b/vcproj-9/login-server.vcproj
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server.vcproj
index 8b85ad3b3..8b85ad3b3 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server.vcproj
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 18:26:45 +0000