Merge git://github.com/TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h

6 files changed, 7 insertions, 43 deletions

diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
index add9fa8694d..ae07b1fc39b 100644
--- a/cmake/compiler/clang/settings.cmake
+++ b/cmake/compiler/clang/settings.cmake
@@ -2,9 +2,9 @@
 add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
 
 if(WITH_WARNINGS)
-  set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Wfatal-errors")
+  set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
   message(STATUS "Clang: All warnings enabled")
 endif()
 
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index d74fc39031b..25ee96c8562 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -11,9 +11,9 @@ add_definitions(-DHAVE_SSE2 -D__SSE2__)
 message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
 
 if( WITH_WARNINGS )
-  set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Winvalid-pch -Wfatal-errors")
+  set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
   message(STATUS "GCC: All warnings enabled")
 endif()
 
diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake
index b7e4cb742b3..58eb63b081d 100644
--- a/cmake/compiler/icc/settings.cmake
+++ b/cmake/compiler/icc/settings.cmake
@@ -9,10 +9,7 @@ endif()
 
 if( WITH_WARNINGS )
   add_definitions(-w1)
-  message(STATUS "ICC All warnings enabled")
-else()
-  add_definitions(-w)
-  message(STATUS "ICC: All warnings disabled")
+  message(STATUS "ICC: All warnings enabled")
 endif()
 
 if( WITH_COREDEBUG )
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake
index addc619207f..e08aaed8db2 100644
--- a/cmake/macros/CheckPlatform.cmake
+++ b/cmake/macros/CheckPlatform.cmake
@@ -11,8 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
 
 if(WIN32)
   include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
-elseif(APPLE)
-  include("${CMAKE_SOURCE_DIR}/cmake/platform/osx/settings.cmake")
 elseif(UNIX)
   include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()
diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake
deleted file mode 100644
index 3d232c5a1f0..00000000000
--- a/cmake/platform/osx/settings.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-set(MACOSX 1)
-
-# set default configuration directory
-if( NOT CONF_DIR )
-  set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
-  message(STATUS "OSX: Using default configuration directory")
-endif()
-
-# set default library directory
-if( NOT LIBSDIR )
-  set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
-  message(STATUS "OSX: Using default library directory")
-endif()
-
-# configure uninstaller
-configure_file(
-  "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake"
-  "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY
-)
-message(STATUS "OSX: Configuring uninstall target")
-
-# create uninstaller target (allows for using "make uninstall")
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
-)
-message(STATUS "OSX: Created uninstall target")
-
-if (CMAKE_COMPILER_IS_GNUCC)
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-endif()
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
index c79cfc4ed4f..a851c8acf7a 100644
--- a/cmake/platform/unix/settings.cmake
+++ b/cmake/platform/unix/settings.cmake
@@ -36,4 +36,6 @@ if(CMAKE_C_COMPILER MATCHES "gcc")
   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")
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
 endif()