scons: Rewrite a couple of conditionals for compatibility with Python…

… 2.3
wesnoth · Apr 16, 2015 · bde80f6 · bde80f6
1 parent 08c6652
commit bde80f6
Showing 1 changed file with 12 additions and 3 deletions.
diff --git 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)]