diff --git a/CMakeLists.txt b/CMakeLists.txt index cf806678081..4959954faf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ 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_LIBPNG "Enable support for writing png files (screenshots, images)" ON) option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON) # set what std version to use @@ -502,13 +501,6 @@ if(ENABLE_GAME) unset(LIBDBUS_FOUND CACHE) endif() - find_package( PNG ) - if(ENABLE_LIBPNG AND PNG_FOUND) - add_definitions(-DHAVE_LIBPNG) - else(ENABLE_LIBPNG AND PNG_FOUND) - message("Could not find lib PNG. Disabling support for writing PNG images.") - endif(ENABLE_LIBPNG AND PNG_FOUND) - find_package( History ) if(ENABLE_HISTORY AND HISTORY_FOUND) add_definitions(-DHAVE_HISTORY) diff --git a/SConstruct b/SConstruct index fdc0f1e4406..b7f2757f1e3 100755 --- a/SConstruct +++ b/SConstruct @@ -79,7 +79,6 @@ opts.AddVariables( PathVariable('python_site_packages_dir', 'sets the directory where python modules are installed', "lib/python/site-packages/wesnoth", PathVariable.PathAccept), BoolVariable('notifications', 'Enable support for desktop notifications', True), BoolVariable('nls','enable compile/install of gettext message catalogs',True), - BoolVariable('png', 'Clear to disable writing png files for screenshots, images', True), PathVariable('prefix', 'autotools-style installation prefix', "/usr/local", PathVariable.PathAccept), PathVariable('prefsdir', 'user preferences directory', "", PathVariable.PathAccept), PathVariable('default_prefs_file', 'default preferences file name', "", PathVariable.PathAccept), @@ -410,10 +409,6 @@ if env["prereqs"]: if client_env['fribidi']: client_env.Append(CPPDEFINES = ["HAVE_FRIBIDI"]) - env["png"] = env["png"] and conf.CheckLib("png") - if env["png"]: - client_env.Append(CPPDEFINES = ["HAVE_LIBPNG"]) - env["history"] = env["history"] and (conf.CheckLib("history") or Warning("Can't find GNU history, disabling history support.")) if env["history"]: client_env.Append(CPPDEFINES = ["HAVE_HISTORY"]) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22f007e793e..8b60e4c4c73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,13 +84,6 @@ set(game-external-libs ${VORBISFILE_LIBRARIES} ) -if(ENABLE_LIBPNG AND PNG_FOUND) - set(game-external-libs - ${game-external-libs} - ${PNG_LIBRARIES} - ) -endif(ENABLE_LIBPNG AND PNG_FOUND) - if(ENABLE_HISTORY AND HISTORY_FOUND) set(game-external-libs ${game-external-libs}