diff --git a/Externals/Bochs_disasm/SConscript b/Externals/Bochs_disasm/SConscript index ebc208178b..a65a733084 100644 --- a/Externals/Bochs_disasm/SConscript +++ b/Externals/Bochs_disasm/SConscript @@ -14,7 +14,7 @@ def filterWarnings(flags): for flag in flags.split() if not flag.startswith('-W') ) -env_bochs = env.Copy( +env_bochs = env.Clone( CCFLAGS = filterWarnings(env['CCFLAGS']), CXXFLAGS = filterWarnings(env['CXXFLAGS']), ) diff --git a/Source/Core/DebuggerWX/src/SConscript b/Source/Core/DebuggerWX/src/SConscript index 27935d8cc4..5532bf23b7 100644 --- a/Source/Core/DebuggerWX/src/SConscript +++ b/Source/Core/DebuggerWX/src/SConscript @@ -15,7 +15,7 @@ files = ["LogWindow.cpp", "RegisterView.cpp", "JitWindow.cpp", ] -wxenv = env.Copy() +wxenv = env.Clone() wxenv.Append( CXXFLAGS = ' ' + ' '.join([ '`wx-config --cppflags`', diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index c37f148fc4..b7476a3df3 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -20,7 +20,7 @@ libs = [ 'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' ] -wxenv = env.Copy() +wxenv = env.Clone() wxenv.Append( CXXFLAGS = ' ' + ' '.join([ '`wx-config --cppflags`', diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 012ac7b8d7..6744ac23cb 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -12,6 +12,6 @@ files = [ "Profiler.cpp", ] -env_common = env.Copy() +env_common = env.Clone() env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ])) env_common.StaticLibrary("videocommon", files) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript index 66e648fcf6..a799ca366a 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript @@ -18,7 +18,7 @@ files = [ "UCodes/UCode_Zelda.cpp", ] -dspenv = env.Copy() +dspenv = env.Clone() dspenv.Append( CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]), LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ]) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 3d1c43d439..759845b1df 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -17,7 +17,7 @@ files = [ "main.cpp", ] -dspenv = env.Copy() +dspenv = env.Clone() dspenv.Append( CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]), LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ]) diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript index 51c6fd958c..ceb07378f2 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/SConscript +++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript @@ -10,5 +10,5 @@ files = [ "main.cpp", ] -padenv = env.Copy() +padenv = env.Clone() padenv.SharedLibrary(output, files, LIBS=["common"]) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 592ce89682..f2eaa02e40 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -59,7 +59,7 @@ if useSDL: compileFlags += [ '`sdl-config --cflags`', '-DUSE_SDL=1' ] linkFlags += [ '`sdl-config --libs`' ] -gfxenv = env.Copy() +gfxenv = env.Clone() gfxenv.Append( CXXFLAGS = ' ' + ' '.join(compileFlags), LINKFLAGS = ' ' + ' '.join(linkFlags) diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript b/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript index a3f94b104e..79013de60f 100644 --- a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript @@ -10,7 +10,7 @@ files = [ "Wiimote_Test.cpp", ] -padenv = env.Copy() +padenv = env.Clone() padenv.Append( CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`' diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript index 654c657159..ed660e7611 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript @@ -12,7 +12,7 @@ files = [ "GUI/ConfigBox.cpp", ] -padenv = env.Copy() +padenv = env.Clone() padenv.Append( CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'