2 Commits

Author	SHA1	Message	Date
kaelima	3d14384c32	Merge git://github.com/TrinityCore/TrinityCore into 4.x ... Conflicts: dep/PackageList.txt sql/base/auth_database.sql src/server/authserver/Server/AuthSocket.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Chat/Commands/Level1.cpp src/server/game/Chat/Commands/Level3.cpp src/server/game/DataStores/DBCEnums.h src/server/game/DataStores/DBCStores.cpp src/server/game/DataStores/DBCStores.h src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Corpse/Corpse.cpp src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/Item/Item.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Transport/Transport.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Loot/LootMgr.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Quests/QuestDef.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/Protocol/Opcodes.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/Spell.h src/server/game/Spells/SpellEffects.cpp src/server/game/Tickets/TicketMgr.cpp src/server/scripts/Commands/cs_gps.cpp src/server/scripts/Commands/cs_modify.cpp src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Logging/Log.h src/tools/map_extractor/CMakeLists.txt src/tools/map_extractor/System.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_extractor/CMakeLists.txt	2012-05-30 08:01:02 +02:00
click	dcaeceaf6b	Buildsystem: Change over to a little more flexible method of using the CMake buildsystem (partially WIP) - REQUIRES RERUNNING CMAKE! ... For finding out the "standard" parameters examine the cmake/options.cmake file and adjacent files for your platform/compiler. For platform settings -> cmake/platform/*/settings.cmake For compiler settings -> cmake/compiler/*/settings.cmake Some more testing and changes IS required, but I don't have OSX/XCode to kill off the main issues --HG-- branch : trunk rename : cmake/FindPlatform.cmake => cmake/macros/CheckPlatform.cmake rename : cmake/FindACE.cmake => cmake/macros/FindACE.cmake rename : cmake/FindMySQL.cmake => cmake/macros/FindMySQL.cmake rename : cmake/FindOpenSSL.cmake => cmake/macros/FindOpenSSL.cmake rename : cmake/FindPCHSupport.cmake => cmake/macros/FindPCHSupport.cmake rename : cmake/FindReadline.cmake => cmake/macros/FindReadline.cmake rename : cmake/cmake_uninstall.cmake.in => cmake_uninstall.cmake.in	2010-08-28 18:49:17 +02:00