azerothcore/azerothcore-wotlk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation fixed

Browse Source
This commit is contained in:
Yehonal
2016-07-10 17:14:06 +02:00
parent a816d11f74
commit 3c517a2b0e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -9,7 +9,7 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Set projectname (must be done AFTER setting configurationtypes) # Set projectname (must be done AFTER setting configurationtypes)
project(SunwellCore) project(AzerothCore)
# CMake policies (can not be handled elsewhere) # CMake policies (can not be handled elsewhere)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
@@ -82,6 +82,7 @@ include(src/cmake/showoptions.cmake)
# add modules and dependencies # add modules and dependencies
AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE) AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
FOREACH(subdir ${sub_DIRS}) FOREACH(subdir ${sub_DIRS})
STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir ${subdir})
message("Loading module: ${subdir}") message("Loading module: ${subdir}")
add_subdirectory("${subdir}") add_subdirectory("${subdir}")
ENDFOREACH() ENDFOREACH()

7
bin/compiler/config.sh.dist
View File

@@ -2,8 +2,11 @@
# set preferred compilers # set preferred compilers
CCOMPILERC="/usr/bin/clang-3.6" #CCOMPILERC="/usr/bin/clang-3.6"
CCOMPILERCXX="/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 ) # how many thread must be used for compilation ( leave zero to use all available )
MTHREADS=0 MTHREADS=0

2
src/tools/mmaps_generator/CMakeLists.txt
View File

@@ -111,7 +111,7 @@ set(mmap_gen_Includes
if( WIN32 ) if( WIN32 )
set(mmap_gen_Includes set(mmap_gen_Includes
${mmap_gen_Includes} ${mmap_gen_Includes}
${CMAKE_SOURCE_DIR}/dep/libmpq/win ${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
) )
endif() endif()