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

Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4

Browse Source 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
This commit is contained in:
Carbenium committed 2015-07-21 18:51:30 +02:00
2 parents 1940583e36 64e34cdec8
commit 8d47083319
4 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmake/platform/unix/settings.cmake
+1 -1
View File
@@ -37,7 +37,7 @@ if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "icc")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "clang")
elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
else()
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')