Skip to content

Commit 3e4f4c5

Browse files
authored
fix building with system boost (#309)
1 parent e7a4c5c commit 3e4f4c5

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

cpp/extlibs/boost/files/boost/config/user.hpp

Lines changed: 0 additions & 2 deletions
This file was deleted.

cpp/extlibs/stringencoders/system/FindStringEncoders.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ find_library(
1313
include(FindPackageHandleStandardArgs)
1414

1515
find_package_handle_standard_args(
16-
STRINGENCODERS REQUIRED_VARS STRINGENCODERS_INCLUDE_DIRS STRINGENCODERS_LIBRARIES
16+
StringEncoders REQUIRED_VARS STRINGENCODERS_INCLUDE_DIRS STRINGENCODERS_LIBRARIES
1717
)
1818

1919
mark_as_advanced(STRINGENCODERS_INCLUDE_DIRS STRINGENCODERS_LIBRARIES)

cpp/server/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ if(OS_WINDOWS)
4141
)
4242
endif()
4343

44+
add_definitions(
45+
-DBOOST_ALL_NO_LIB=1
46+
-DBOOST_THREAD_PROVIDES_FUTURE_CONTINUATION=1
47+
)
48+
4449
find_package(Boost REQUIRED COMPONENTS system filesystem thread)
4550
find_package(Nljson REQUIRED)
4651
find_package(StringEncoders REQUIRED)

cpp/server/player_events.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "defines.hpp"
44
#include "player_api.hpp"
55

6+
#include <atomic>
67
#include <unordered_set>
78
#include <bitset>
89
#include <mutex>

cpp/server/settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void tryCopyFile(const Path& from, const Path& to)
6060
fs::copy_file(from, to, ec);
6161

6262
if (ec.failed())
63-
logError("copying failed: %s", ec.what().c_str());
63+
logError("copying failed: %s", ec.message().c_str());
6464
}
6565
}
6666

0 commit comments

Comments
 (0)