Skip to content

Commit

Permalink
Revert "Remove check for boost.thread from buildsystems since it's no…
Browse files Browse the repository at this point in the history
…t used anymore"

This reverts commit 4c74977.
Explicit linking against boost_thread is required when using boost as
static libraries.
  • Loading branch information
loonycyborg committed Oct 25, 2019
1 parent 88a223b commit 1d80308
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -75,7 +75,7 @@ else()
set(CRYPTO_LIBRARY "-framework Security")
endif()

find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system random)
find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system thread random)

# no, gettext executables are not required when NLS is deactivated
find_package(Gettext)
Expand Down
1 change: 1 addition & 0 deletions SConstruct
Expand Up @@ -367,6 +367,7 @@ if env["prereqs"]:
conf.CheckBoost("random", require_version = boost_version) & \
conf.CheckBoost("smart_ptr", header_only = True) & \
CheckAsio(conf) & \
conf.CheckBoost("thread") & \
conf.CheckBoost("locale") & \
conf.CheckBoost("filesystem") \
and Info("Base prerequisites are met")) \
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Expand Up @@ -76,6 +76,7 @@ set(game-external-libs
${CRYPTO_LIBRARY}
${Boost_SYSTEM_LIBRARIES}
${Boost_RANDOM_LIBRARY}
${Boost_THREAD_LIBRARY}
${sdl_image-lib}
${sdl_mixer-lib}
${sdl_ttf-lib}
Expand Down

0 comments on commit 1d80308

Please sign in to comment.