Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch '3.3.5' into 4.3.4

Browse Source 
Conflicts:
	sql/base/auth_database.sql
	sql/updates/world/2015_08_29_00_world.sql
	sql/updates/world/2015_08_29_01_world.sql
	sql/updates/world/2015_08_30_00_world.sql
	sql/updates/world/2015_08_31_01_world.sql
	sql/updates/world/2015_09_02_00_world.sql
	sql/updates/world/2015_09_02_01_world.sql
	sql/updates/world/2015_09_02_04_world.sql
	sql/updates/world/2015_09_03_00_world.sql
	sql/updates/world/2015_09_03_01_world.sql
	sql/updates/world/2015_09_03_02_world.sql
	sql/updates/world/2015_09_03_03_world.sql
	sql/updates/world/2015_09_03_04_world.sql
	sql/updates/world/2015_09_03_06_world.sql
	sql/updates/world/2015_09_03_07_world.sql
	sql/updates/world/2015_09_03_08_world.sql
	sql/updates/world/2015_09_03_09_world.sql
	sql/updates/world/2015_09_03_10_world.sql
	sql/updates/world/2015_09_03_11_world.sql
	sql/updates/world/2015_09_04_00_world.sql
	sql/updates/world/2015_09_04_01_world.sql
	sql/updates/world/2015_09_04_02_world.sql
	sql/updates/world/2015_09_04_03_world.sql
	sql/updates/world/2015_09_07_00_world.sql
	sql/updates/world/2015_09_07_01_world.sql
	sql/updates/world/2015_09_07_02_world.sql
	sql/updates/world/2015_09_07_03_world.sql
	sql/updates/world/2015_09_07_04_world.sql
	sql/updates/world/2015_09_07_05_world.sql
	sql/updates/world/2015_09_08_00_world.sql
	src/common/Collision/Management/MMapManager.cpp
	src/common/Cryptography/Authentication/AuthCrypt.cpp
	src/common/Cryptography/Authentication/AuthCrypt.h
	src/common/Cryptography/HMACSHA1.cpp
	src/common/Cryptography/HMACSHA1.h
	src/server/CMakeLists.txt
	src/server/collision/CMakeLists.txt
	src/server/game/CMakeLists.txt
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.cpp
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_cheat.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
This commit is contained in:
Carbenium committed 2015-09-15 20:42:34 +02:00
2 parents 5c23e0b61f 31eb2c5e0b
commit 221f1405b6
252 files changed
+5466 -5950
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/shared/CMakeLists.txt
+11 -38
View File
@@ -12,25 +12,16 @@ if( USE_COREPCH )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
endif()
file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h)
file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h)
file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h)
file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores/*.h)
file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic/*.h)
file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging/*.h)
file(GLOB_RECURSE sources_Networking Networking/*.cpp Networking/*.h)
file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets/*.h)
file(GLOB_RECURSE sources_Threading Threading/*.cpp Threading/*.h)
file(GLOB_RECURSE sources_Updater Updater/*.cpp Updater/*.h)
file(GLOB_RECURSE sources_Utilities Utilities/*.cpp Utilities/*.h)
if( WIN32 )
file(GLOB_RECURSE sources_Service Service/*.cpp Service/*.h)
endif( WIN32 )
file(GLOB sources_localdir *.cpp *.h)
# Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in shared project
# It needs to be included both in authserver and worldserver for the static global variable to be properly initialized
# and to handle crash logs on windows
set(sources_Debugging Debugging/Errors.cpp Debugging/Errors.h)
#
# Build shared sourcelist
#
@@ -42,43 +33,23 @@ endif()
set(shared_STAT_SRCS
${shared_STAT_SRCS}
${sources_Configuration}
${sources_Cryptography}
${sources_Database}
${sources_DataStores}
${sources_Debugging}
${sources_Dynamic}
${sources_Logging}
${sources_Networking}
${sources_Packets}
${sources_Threading}
${sources_Updater}
${sources_Utilities}
${sources_Service}
${sources_localdir}
)
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/dep/SFMT
${CMAKE_SOURCE_DIR}/dep/cppformat
${CMAKE_SOURCE_DIR}/dep/utf8cpp
${CMAKE_SOURCE_DIR}/dep/process
${CMAKE_SOURCE_DIR}/src/server
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Configuration
${CMAKE_CURRENT_SOURCE_DIR}/Cryptography
${CMAKE_CURRENT_SOURCE_DIR}/Database
${CMAKE_CURRENT_SOURCE_DIR}/DataStores
${CMAKE_CURRENT_SOURCE_DIR}/Debugging
${CMAKE_CURRENT_SOURCE_DIR}/Dynamic
${CMAKE_CURRENT_SOURCE_DIR}/Logging
${CMAKE_CURRENT_SOURCE_DIR}/Networking
${CMAKE_CURRENT_SOURCE_DIR}/Packets
${CMAKE_CURRENT_SOURCE_DIR}/Threading
${CMAKE_CURRENT_SOURCE_DIR}/Utilities
${CMAKE_CURRENT_SOURCE_DIR}/Updater
${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
${CMAKE_SOURCE_DIR}/dep/cppformat
${CMAKE_SOURCE_DIR}/src/common/
${CMAKE_SOURCE_DIR}/src/common/Debugging
${CMAKE_SOURCE_DIR}/src/common/Logging
${CMAKE_SOURCE_DIR}/src/common/Utilities
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${VALGRIND_INCLUDE_DIR}
@@ -91,6 +62,8 @@ add_library(shared STATIC
${shared_STAT_PCH_SRC}
)
add_dependencies(shared revision_data.h)
# Generate precompiled header
if (USE_COREPCH)
add_cxx_pch(shared ${shared_STAT_PCH_HDR} ${shared_STAT_PCH_SRC})