From bde80f6887eab17b6f0b9a725a5bf8e874cbfc3d Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Thu, 16 Apr 2015 05:49:47 -0300 Subject: [PATCH] scons: Rewrite a couple of conditionals for compatibility with Python 2.3 --- src/SConscript | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/SConscript b/src/SConscript index c6823028ce7d..d235c5367649 100644 --- a/src/SConscript +++ b/src/SConscript @@ -62,9 +62,18 @@ if env['default_prefs_file']: libwesnoth_core_sources.extend([ game_config_env.Object("game_config.cpp"), - filesystem_env.Object("filesystem_common.cpp"), - filesystem_env.Object("filesystem_boost.cpp") if env["boostfilesystem"] else filesystem_env.Object("filesystem.cpp"), - filesystem_env.Object("gettext_boost.cpp") if env["boostfilesystem"] else filesystem_env.Object("gettext.cpp") + filesystem_env.Object("filesystem_common.cpp") +]) + +if env["boostfilesystem"]: + libwesnoth_core_sources.extend([ + filesystem_env.Object("filesystem_boost.cpp"), + filesystem_env.Object("gettext_boost.cpp") + ]) +else: + libwesnoth_core_sources.extend([ + filesystem_env.Object("filesystem.cpp"), + filesystem_env.Object("gettext.cpp") ]) libwesnoth_core = [env.Library("wesnoth_core", libwesnoth_core_sources)]