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/char | |
| 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/char')
| -rw-r--r-- | src/char/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/char/Makefile.in | 14 |
2 files changed, 15 insertions, 15 deletions
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" |