--- src/SConscript.orig 2021-01-26 14:07:26.279297036 +0100 +++ src/SConscript 2021-01-26 14:07:52.426086997 +0100 @@ -79,7 +79,7 @@ state_io_objs = [build_env.Object(src) for src in state_io_srcs]; state_io_packages = "gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 glib-2.0 libxml-2.0" -release_env = build_env.Copy (CPPDEFINES = [('NONPAREIL_RELEASE', build_env ['RELEASE'])]) +release_env = build_env.Clone (CPPDEFINES = [('NONPAREIL_RELEASE', build_env ['RELEASE'])]) common_objs.append (release_env.Object ('release.c')) build_env.ParseConfig(pkg_config_cmd + state_io_packages) @@ -89,7 +89,7 @@ #----------------------------------------------------------------------------- if build_env ['build_target_only'] == 0: - str2png_env = build_env.Copy () + str2png_env = build_env.Clone () str2png_env.Append (CPPDEFINES = [('DEFAULT_PATH', 'image')]) @@ -196,7 +196,7 @@ #----------------------------------------------------------------------------- if not build_target_only: - title_env = native_env.Copy (STR2PNG_STRING = 'NONPAREIL', + title_env = native_env.Clone (STR2PNG_STRING = 'NONPAREIL', STR2PNG_OPTS = '-x 40 -y 44 -m 10') title_env.STR2PNG (target = 'nonpareil_title', @@ -205,7 +205,7 @@ native_env.PNG2C (target = '#build/common/nonpareil_title_png.c', source = 'nonpareil_title.png') - rgoose_env = native_env.Copy (STR2PNG_STRING = '.', + rgoose_env = native_env.Clone (STR2PNG_STRING = '.', STR2PNG_OPTS = '-x 40 -y 44') rgoose_env.STR2PNG (target = 'rgoose', @@ -214,7 +214,7 @@ native_env.PNG2C (target = '#build/common/rgoose_png.c', source = 'rgoose.png') - lgoose_env = native_env.Copy (STR2PNG_STRING = ',', + lgoose_env = native_env.Clone (STR2PNG_STRING = ',', STR2PNG_OPTS = '-x 40 -y 44') lgoose_env.STR2PNG (target = 'lgoose', @@ -235,7 +235,7 @@ # nonpareil #----------------------------------------------------------------------------- -nonpareil_env = build_env.Copy () +nonpareil_env = build_env.Clone () nonpareil_srcs = Split ("""proc.c glib_async_queue_source.c about.c goose.c pixbuf_util.c @@ -284,7 +284,7 @@ if (not ming) or (cross and not build_target_only): nonpareil_env.ParseConfig (sdl_pkg_config_cmd) -csim_env = nonpareil_env.Copy () +csim_env = nonpareil_env.Clone () if not ming: csim_env.Append (CPPDEFINES = [('DEFAULT_PATH', build_env ['libdir'])]) @@ -296,7 +296,7 @@ if build_env ['has_debugger_cli']: csim_env.Append (CPPDEFINES = [('HAS_DEBUGGER_CLI', 1)]) - debugger_cli_env = csim_env.Copy () + debugger_cli_env = csim_env.Clone () if build_env ['use_tcl']: debugger_cli_env.Append (CPPDEFINES = [('USE_TCL', 1)]) nonpareil_env.Append (LIBS = 'tcl') @@ -325,7 +325,7 @@ # udis #----------------------------------------------------------------------------- -udis_env = build_env.Copy () +udis_env = build_env.Clone () udis_srcs = Split ("""dis.c""") @@ -336,7 +336,7 @@ # nsim_conv #----------------------------------------------------------------------------- -nsim_conv_env = build_env.Copy () +nsim_conv_env = build_env.Clone () nsim_conv_srcs = Split ("""nsim_conv.c state_read_nsim.c state_write_nsim.c""")