mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-30 00:53:46 +00:00
compilation fixed
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user