diff options
| author | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
| commit | 78b4db8a026e9e16367daa12eac03955815ef94c (patch) | |
| tree | 813912e643c2ccaa180267a746a5d932cf2ae6a9 /src/login | |
| parent | 484c1b6ac438e58c66f5ff16b09e2cf07c8e1981 (diff) | |
| download | hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.gz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.bz2 hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.xz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.zip | |
Dropped _sql suffix in server names.
Updated .gitignore to reflect this change, also renamed some other stuff to make their functionality clearer.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/Makefile.in | 8 | ||||
| -rw-r--r-- | src/login/sql/CMakeLists.txt | 18 |
2 files changed, 13 insertions, 13 deletions
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 ) |