From 3c517a2b0e8c36161f8ac86e00bc3102483959af Mon Sep 17 00:00:00 2001
From: Yehonal <hw.2@hotmail.it>
Date: Sun, 10 Jul 2016 17:14:06 +0200
Subject: [PATCH] compilation fixed

---
 CMakeLists.txt                           | 3 ++-
 bin/compiler/config.sh.dist              | 7 +++++--
 src/tools/mmaps_generator/CMakeLists.txt | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bdcbab75..869869b4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Set projectname (must be done AFTER setting configurationtypes)
-project(SunwellCore)
+project(AzerothCore)
 
 # CMake policies (can not be handled elsewhere)
 cmake_minimum_required(VERSION 2.8)
@@ -82,6 +82,7 @@ include(src/cmake/showoptions.cmake)
 # add modules and dependencies
 AZTH_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
 FOREACH(subdir ${sub_DIRS})
+    STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir ${subdir})
     message("Loading module: ${subdir}")
     add_subdirectory("${subdir}")
 ENDFOREACH()
diff --git a/bin/compiler/config.sh.dist b/bin/compiler/config.sh.dist
index e4f297e5f..7074e8634 100644
--- a/bin/compiler/config.sh.dist
+++ b/bin/compiler/config.sh.dist
@@ -2,8 +2,11 @@
 
 
 # set preferred compilers
-CCOMPILERC="/usr/bin/clang-3.6"
-CCOMPILERCXX="/usr/bin/clang++-3.6"
+#CCOMPILERC="/usr/bin/clang-3.6"
+#CCOMPILERCXX="/usr/bin/clang++-3.6"
+CCOMPILERC="/usr/bin/gcc"
+CCOMPILERCC="/usr/bin/gcc"
+CCOMPILERCXX="/usr/bin/g++"
 
 # how many thread must be used for compilation ( leave zero to use all available )
 MTHREADS=0
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 3fa480f96..6ef1d2120 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
 if( WIN32 )
   set(mmap_gen_Includes
     ${mmap_gen_Includes}
-    ${CMAKE_SOURCE_DIR}/dep/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
     )
 endif()