Fix SConstruct for scons 4.5+

In scons 4.5+ env['CPPDEFINES'] can sometimes return a deque object. See SCons/scons#4321
CDarrow · Apr 16, 2023 · 6bc047b · 6bc047b
1 parent b9e30e9
commit 6bc047b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/d1/SConstruct b/d1/SConstruct
@@ -371,7 +371,7 @@ class DXXProgram(DXXCommon):
 		objects = [self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, os.path.splitext(s)[0], self.env["OBJSUFFIX"]), source=s) for s in self.common_sources]
 		objects.extend(self.platform_settings.platform_objects)
 		objects.extend(program_specific_objects)
-		versid_cppdefines=env['CPPDEFINES'][:]
+		versid_cppdefines=list(env['CPPDEFINES'])
 		if self.user_settings.extra_version:
 			versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
 		objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))

diff --git a/d2/SConstruct b/d2/SConstruct
@@ -372,7 +372,7 @@ class DXXProgram(DXXCommon):
 		objects = [self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, os.path.splitext(s)[0], self.env["OBJSUFFIX"]), source=s) for s in self.common_sources]
 		objects.extend(self.platform_settings.platform_objects)
 		objects.extend(program_specific_objects)
-		versid_cppdefines=env['CPPDEFINES'][:]
+		versid_cppdefines=list(env['CPPDEFINES'])
 		if self.user_settings.program_name:
 			exe_target = self.user_settings.program_name
 		if self.user_settings.extra_version: