Merge branch 'azerothcore:master' into Playerbot

This commit is contained in:
ZhengPeiRu21
2022-06-10 08:51:40 -06:00
committed by GitHub
21 changed files with 697 additions and 55 deletions

3
deps/CMakeLists.txt vendored
View File

@@ -26,8 +26,7 @@ add_subdirectory(stdfs)
add_subdirectory(threads)
add_subdirectory(utf8cpp)
# if ((APPS_BUILD AND (NOT APPS_BUILD STREQUAL "none")) OR BUILD_TOOLS_DB_IMPORT) #DB import PR
if ((APPS_BUILD AND (NOT APPS_BUILD STREQUAL "none")))
if ((APPS_BUILD AND (NOT APPS_BUILD STREQUAL "none")) OR BUILD_TOOLS_DB_IMPORT)
add_subdirectory(mysql)
endif()