From 5ee985b2317f17ed404586ec71ffcbe5f25d1003 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 9 Jun 2010 07:53:07 -0600 Subject: [PATCH] * Rename trinitycore.conf / ico / windows properties --HG-- branch : trunk rename : src/server/worldserver/trinitycore.conf.dist => src/server/worldserver/worldserver.conf.dist rename : src/server/worldserver/TrinityCore.ico => src/server/worldserver/worldserver.ico rename : src/server/worldserver/TrinityCore.rc => src/server/worldserver/worldserver.rc --- src/server/worldserver/CMakeLists.txt | 4 ++-- ...{trinitycore.conf.dist => worldserver.conf.dist} | 0 .../{TrinityCore.ico => worldserver.ico} | Bin .../worldserver/{TrinityCore.rc => worldserver.rc} | 12 ++++++------ 4 files changed, 8 insertions(+), 8 deletions(-) rename src/server/worldserver/{trinitycore.conf.dist => worldserver.conf.dist} (100%) rename src/server/worldserver/{TrinityCore.ico => worldserver.ico} (100%) rename src/server/worldserver/{TrinityCore.rc => worldserver.rc} (87%) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 9bf9cb1d4b0..058338f98ed 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -122,7 +122,7 @@ SET(worldserver_LINK_FLAGS "") add_executable(worldserver ${worldserver_SRCS}) add_definitions( --D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"' +-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"' ) IF (DO_MYSQL) SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}") @@ -168,5 +168,5 @@ install(TARGETS worldserver DESTINATION bin) ########### install files ############### -install(FILES trinitycore.conf.dist DESTINATION etc) +install(FILES worldserver.conf.dist DESTINATION etc) diff --git a/src/server/worldserver/trinitycore.conf.dist b/src/server/worldserver/worldserver.conf.dist similarity index 100% rename from src/server/worldserver/trinitycore.conf.dist rename to src/server/worldserver/worldserver.conf.dist diff --git a/src/server/worldserver/TrinityCore.ico b/src/server/worldserver/worldserver.ico similarity index 100% rename from src/server/worldserver/TrinityCore.ico rename to src/server/worldserver/worldserver.ico diff --git a/src/server/worldserver/TrinityCore.rc b/src/server/worldserver/worldserver.rc similarity index 87% rename from src/server/worldserver/TrinityCore.rc rename to src/server/worldserver/worldserver.rc index 151185f3cec..939d6bdd355 100644 --- a/src/server/worldserver/TrinityCore.rc +++ b/src/server/worldserver/worldserver.rc @@ -36,7 +36,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_APPICON ICON "TrinityCore.ico" +IDI_APPICON ICON "worldserver.ico" ///////////////////////////////////////////////////////////////////////////// // Neutre (Par défaut système) resources @@ -69,12 +69,12 @@ BEGIN BEGIN BLOCK "080004b0" BEGIN - VALUE "FileDescription", "TrinityCore" + VALUE "FileDescription", "worldserver" VALUE "FileVersion", STRFILEVER - VALUE "InternalName", "TrinityCore" - VALUE "LegalCopyright", "Copyright (C) 2008-2009" - VALUE "OriginalFilename", "TrinityCore.exe" - VALUE "ProductName", "TrinityCore" + VALUE "InternalName", "worldserver" + VALUE "LegalCopyright", "Copyright (C) 2008-2010" + VALUE "OriginalFilename", "worldserver.exe" + VALUE "ProductName", "worldserver" VALUE "ProductVersion", STRPRODUCTVER END END