diff --git a/.travis.yml b/.travis.yml index 42e77b4cb2603..f5ec1d305bd64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: - mysql -uroot -e 'create database test_mysql;' - mkdir bin - cd bin - - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DWITH_CPR=0 + - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DWITH_CPR=1 - cd .. - chmod +x contrib/check_updates.sh diff --git a/dep/cpr/CMakeLists.txt b/dep/cpr/CMakeLists.txt index 22e8b01755274..ddb107d5e1c9f 100644 --- a/dep/cpr/CMakeLists.txt +++ b/dep/cpr/CMakeLists.txt @@ -66,7 +66,7 @@ set(GENERATE_COVERAGE OFF) cpr_option(CPR_CURL_NOSIGNAL "Set to ON to disable use of signals in libcurl." OFF) cpr_option(USE_SYSTEM_GTEST "If ON, this project will look in the system paths for an installed gtest library" OFF) -cpr_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON) +cpr_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" OFF) message(STATUS "=======================================================") add_subdirectory(opt) diff --git a/dep/cpr/cpr/CMakeLists.txt b/dep/cpr/cpr/CMakeLists.txt index b1373208ccdee..9e15255e46a1e 100644 --- a/dep/cpr/cpr/CMakeLists.txt +++ b/dep/cpr/cpr/CMakeLists.txt @@ -40,6 +40,7 @@ add_library(${CPR_LIBRARIES} STATIC "${CPR_INCLUDE_DIRS}/cpr/ssl_options.h") message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.") +set_property(TARGET ${CPR_LIBRARIES} PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(${CPR_LIBRARIES} ${CURL_LIBRARIES}) diff --git a/dep/cpr/cpr/session.cpp b/dep/cpr/cpr/session.cpp index 371a1e2ef7992..bb53280bf6ce5 100644 --- a/dep/cpr/cpr/session.cpp +++ b/dep/cpr/cpr/session.cpp @@ -3,7 +3,7 @@ #include #include #include - +#define CURL_STATICLIB #include #include "cpr/curlholder.h" diff --git a/dep/cpr/opt/CMakeLists.txt b/dep/cpr/opt/CMakeLists.txt index 1a3059a4dd005..130532f1a4a68 100644 --- a/dep/cpr/opt/CMakeLists.txt +++ b/dep/cpr/opt/CMakeLists.txt @@ -58,6 +58,7 @@ if(NOT USE_SYSTEM_CURL OR NOT CURL_FOUND) endif() set_property(TARGET libcurl PROPERTY FOLDER "external") + set_property(TARGET libcurl PROPERTY POSITION_INDEPENDENT_CODE ON) endif() set_cache_variable(CURL_FOUND "Set if libcurl is found or built") diff --git a/dep/cpr/opt/curl/CMakeLists.txt b/dep/cpr/opt/curl/CMakeLists.txt index eb9f55f971b09..e8b640c23e250 100644 --- a/dep/cpr/opt/curl/CMakeLists.txt +++ b/dep/cpr/opt/curl/CMakeLists.txt @@ -76,7 +76,7 @@ include_directories( ${CURL_SOURCE_DIR}/include ) option(CURL_WERROR "Turn compiler warnings into errors" OFF) set(PICKY_COMPILER ON) set(BUILD_CURL_EXE OFF) -option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF) +option(CURL_STATICLIB "Set to ON to build libcurl with static linking." ON) option(ENABLE_ARES "Set to ON to enable c-ares support" OFF) if(WIN32) option(CURL_STATIC_CRT "Set to ON to build libcurl with static CRT on Windows (/MT)." OFF) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1c3e310764c5a..482a5d84a71b3 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -26540,7 +26540,7 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, AELootResult* aeResult/* if (Guild* guild = GetGuild()) guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid); - TC_LOG_INFO("metric", "%s(%u) looted item %u count %u", + TC_LOG_INFO("metric", "%s(%lu) looted item %u count %u", GetName().c_str(), GetGUID().GetCounter(), item->itemid, item->count); }