Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,000 Commits 4 Branches 146 Tags
db00a9fd2c7dbf4b73f070dafac0af4e2cf96c1e
Commit Graph

21 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
b342e4ce16 Buildsystem: Minor correction on the BUILD_DIRECTIVE definition on OSX - now with extra testing behind it. 2011-01-01 09:49:23 +01:00
click
2325e8b3d6 Buildsystem: Adjust XCode definition variable for _BUILD_DIRECTIVE 
Fixes the "Expected ')' before 'Debug'" error during compile for XCode users.
 2010-12-30 15:16:17 +01:00
click
61d6397559 Core/Buildsystem: Adjust the variable so it works on MSVC9 again (danged MS and renaming variables) 
--HG--
branch : trunk
 2010-12-20 02:54:04 +01:00
leak
4c9cfa6739 Core/Buildsystem: Resolved quoting problem that caused gcc to spam warnings. Patch by click. 
--HG--
branch : trunk
 2010-12-20 02:23:55 +01:00
click
30908638cb Core/Buildsystem: Set up mutliprocess compiles for all buildmodes (non-PCH/PCH with and without debugmodes) 
--HG--
branch : trunk
 2010-11-19 13:43:13 +01:00
click
ea847598d0 Buildsystem: Add initial support for Intel C++ Compiler (patch by Leak) 
Note: Intel C++ Compiler for Windows is not supported in this change
Closes issue 4361

--HG--
branch : trunk
 2010-10-21 22:00:12 +02:00
click
88f81d80a4 BuildSystem: Add XCode specific compiler handling in the OSX compile-instructions (_BUILD_DIRECTIVE gave error) 
Update issue #4368
OSX/XCode compilation is not "fixed" as such untill a newew release of G3D is sorted. This is worked on from the G3D developers, and known.

--HG--
branch : trunk
 2010-10-20 16:35:17 +02:00
click
62b853e8ed BuildSystem: Fix missing variable parameter encapsulation for _BUILD_DIRECTIVE (gcc/xcode) 
--HG--
branch : trunk
 2010-09-30 13:04:46 +02:00
click
b87d8f4700 Buildsystem: Overhaul of the CMake buildsystem: 
- utilize CMake for completely generating revision.h (kills off genrev and revision.h targets):
  - pull and set correct revision-ID/hash from Mercurial (hg) when using regular repository sourcetree
  - pull and set correct revision-ID/hash from archived releases (when pulled from googlecode)
  - set and use _BUILD_DIRECTIVE definition (earlier part of revision.h) as compiletime definition
- delete genrev and related buildsystems
  (now deprecated)
- Move some files around to adhere to buildsystem structure
Thanks to Shauren for figuring out the definition-behaviour for MSVC while he was in the shower

--HG--
branch : trunk
rename : cmake_uninstall.cmake.in => cmake/platform/unix/cmake_uninstall.in.cmake
 2010-09-29 23:42:09 +02:00
click
f69c252f1d Buildsystem/Compilers: Adjust buildfiles slightly: 
- Set SSE2 compile-flags only when used on 32-bit platforms (only used on x86 platforms, as x64 / Itanium has this as a standard)
- Clean up/merge some of the 64-bit/32-bit compiler options
- Clean up use of the PLATFORM variable (now sets PLATFORM 32 or PLATFORM 64, shaving off the CMAKE_SIZEOF_VOID_P test slightly)

--HG--
branch : trunk
 2010-09-20 20:58:57 +02:00
click
58dafd94e2 BuildSystem/Platforms: Move platform-specific settings into respective directories, consistent with what is done with compilers. 
BuildSystem/GCC: Add some additional parameters when using SFMT

--HG--
branch : trunk
 2010-09-19 18:17:53 +02:00
Xanadu
62673ec25e Fixed win x64 debug build. Thx to click for inspiration. 
--HG--
branch : trunk
 2010-09-06 02:36:54 +02:00
click
174f2884b7 Buildsystem/MSVC: Only use /bigobj on x64 platforms - should solve x86 debug compilations (needs feedback) 
--HG--
branch : trunk
 2010-08-31 20:14:16 +02:00
click
8d0f2f8a31 Buildsystem/MSVC: Correct 'bigobj' flag to lowercase 
--HG--
branch : trunk
 2010-08-30 18:29:39 +02:00
click
b0d85ac185 Buildsystem/MSVC: Reinstate regular flags, seems like C++-flags and C-flags doesn't mix very well on MSVC 
--HG--
branch : trunk
 2010-08-30 11:50:48 +02:00
click
b53cec3d5b Buildsystem/MSVC: Ensure same compileoptions for both CXX and C objects 
--HG--
branch : trunk
 2010-08-30 11:22:54 +02:00
click
135a026eff Buildsystem/MSVC: Enable bigobject support for debug-compiles 
--HG--
branch : trunk
 2010-08-30 11:08:32 +02:00
click
9648cf7f39 Buildsystem: Make MSVC behave a wee bit better : 
- Overload standard names with "secure" versions
- Disable "non-secure" warnings by default
- Disable POSIX-warnings by default

--HG--
branch : trunk
 2010-08-29 12:56:34 +02:00
click
3fa20f4cf3 Buildsystem: Make options load BEFORE platformchecks, so they are preloaded correctly 
+ add some more output to make it easier to find possible issues with the new layout

--HG--
branch : trunk
 2010-08-28 21:42:07 +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