Merge branch 'master' into jgrpp

# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp

cmake/Options.cmake

@@ -55,8 +55,20 @@ 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)
-    option(OPTION_USE_THREADS "Use threads" 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)
+
+    if (OPTION_DOCS_ONLY)
+        set(OPTION_TOOLS_ONLY ON PARENT_SCOPE)
+    endif()
 endfunction()
 
 # Show the values of the generic options.

cmake/PackageBundle.cmake

@@ -5,6 +5,7 @@ set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/os/macosx/openttd.icns")
 set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
 set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/os/macosx/launch.sh")
 set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/os/macosx/splash.png")
+set(CPACK_DMG_FORMAT "UDBZ")
 
 # Create a temporary Info.plist.in, where we will fill in the version via
 # CPackProperties.cmake.in. This because at this point in time the version