From e866ca8adca8ab90cb40d7a4a7a40b5357a1632b Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Fri, 29 Mar 2024 23:26:32 +0100 Subject: [PATCH] Cleanup 69d5b9d3: actually clean up all remnants of "no-thread" builds (#12398) --- COMPILING.md | 3 --- cmake/Options.cmake | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 578b5e4568..dfdcd4ead5 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -110,9 +110,6 @@ builds. - `-DOPTION_USE_ASSERTS=OFF`: disable asserts. Use with care, as assert statements capture early signs of trouble. Release builds have them disabled by default. -- `-DOPTION_USE_THREADS=OFF`: disable the use of threads. This will block - the interface in many places, and in general gives a worse experience of - the game. Use with care. - `-DOPTION_TOOLS_ONLY=ON`: only build tools like `strgen`. Does not build the game itself. Useful for cross-compiling. diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 3c8692fe4a..38d708c717 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -57,13 +57,6 @@ function(set_options) option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF) option(OPTION_INSTALL_FHS "Install with Filesystem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS}) option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON) - if(EMSCRIPTEN) - # Although pthreads is supported, it is not in a way yet that is - # useful for us. - option(OPTION_USE_THREADS "Use threads" OFF) - else() - option(OPTION_USE_THREADS "Use threads" ON) - endif() option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF) option(OPTION_TOOLS_ONLY "Build only tools target" OFF) option(OPTION_DOCS_ONLY "Build only docs target" OFF) @@ -85,7 +78,6 @@ function(show_options) message(STATUS "Option Dedicated - ${OPTION_DEDICATED}") message(STATUS "Option Install FHS - ${OPTION_INSTALL_FHS}") message(STATUS "Option Use assert - ${OPTION_USE_ASSERTS}") - message(STATUS "Option Use threads - ${OPTION_USE_THREADS}") message(STATUS "Option Use NSIS - ${OPTION_USE_NSIS}") if(OPTION_SURVEY_KEY) @@ -109,10 +101,6 @@ function(add_definitions_based_on_options) add_definitions(-DDEDICATED) endif() - if(NOT OPTION_USE_THREADS) - add_definitions(-DNO_THREADS) - endif() - if(OPTION_USE_ASSERTS) add_definitions(-DWITH_ASSERT) else()