Remove build options for OpenMP.

CMakeLists.txt

@@ -56,7 +56,6 @@ option(ENABLE_SERVER "Enable compilation of MP server" ON)
 option(ENABLE_MYSQL "Enable building MP/add-ons servers with mysql support" OFF)
 option(ENABLE_TESTS "Build unit tests")
 option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME})
-option(ENABLE_OMP "Enables OpenMP, and has additional dependencies" OFF)
 option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)
 
 if(ENABLE_GAME OR ENABLE_TESTS)
@@ -483,12 +482,6 @@ if(DEFAULT_PREFS_FILE)
 	endif(NOT DEFAULT_PREFS_FILE MATCHES "^/")
 endif(DEFAULT_PREFS_FILE)
 
-if(ENABLE_OMP)
-	find_package(OpenMP REQUIRED)
-	set(CMAKE_C_FLAGS "${OpenMP_C_FLAGS} ${CMAKE_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_C_FLAGS}")
-endif(ENABLE_OMP)
-
 if(ENABLE_DEBUG_WINDOW_LAYOUT)
 	add_definitions(-DDEBUG_WINDOW_LAYOUT_GRAPHS)
 endif(ENABLE_DEBUG_WINDOW_LAYOUT)

SConstruct

@@ -110,7 +110,6 @@ opts.AddVariables(
     ('ctool', 'Set c compiler command if not using standard compiler.'),
     ('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
     EnumVariable('cxx_std', 'Target c++ std version', '11', ['11', '1y', '14']),
-    BoolVariable('openmp', 'Enable openmp use.', False),
     ('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''),
     BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
     BoolVariable("autorevision", 'Use autorevision tool to fetch current git revision that will be embedded in version string', True),
@@ -474,9 +473,6 @@ for env in [test_env, client_env, env]:
             env.AppendUnique(CXXFLAGS = Split("-Wdocumentation -Wno-documentation-deprecated-sync"))
 
     if "gcc" in env["TOOLS"]:
-        if env['openmp']:
-            env.AppendUnique(CXXFLAGS = ["-fopenmp"], LIBS = ["gomp"])
-
         env.AppendUnique(CCFLAGS = Split("-Wno-unused-local-typedefs -Wno-maybe-uninitialized"))
         env.AppendUnique(CXXFLAGS = Split("-Wold-style-cast"))
 

changelog.md

@@ -67,6 +67,7 @@
  ### Miscellaneous and bug fixes
    * Update various references of mermen to merfolk or mer
    * Adjust several maps to use different castle graphics
+   * OpenMP support has been removed
 
 ## Version 1.14.8
  * Skipped due to need to reupload a broken 1.14.7 macOS App Store package as 1.14.8

cwesnoth.cmd

@@ -11,11 +11,6 @@ setlocal
 rem Disable stdout.txt/stderr.txt redirection in SDLmain.
 set SDL_STDIO_REDIRECT=0
 
-rem OpenMP builds need to set this variable on startup and relaunch Wesnoth in
-rem order to prevent constant busy waits. Do it here so the restart doesn't
-rem cause this script to return to the shell too early.
-set OMP_WAIT_POLICY=PASSIVE
-
 wesnoth --wconsole %*
 
 endlocal