SConscript made all the rest of env.Copy into env.Clone
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@542 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
d36844799b
commit
0f4c4b6e1c
|
@ -14,7 +14,7 @@ def filterWarnings(flags):
|
||||||
for flag in flags.split()
|
for flag in flags.split()
|
||||||
if not flag.startswith('-W')
|
if not flag.startswith('-W')
|
||||||
)
|
)
|
||||||
env_bochs = env.Copy(
|
env_bochs = env.Clone(
|
||||||
CCFLAGS = filterWarnings(env['CCFLAGS']),
|
CCFLAGS = filterWarnings(env['CCFLAGS']),
|
||||||
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
|
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
|
||||||
)
|
)
|
||||||
|
|
|
@ -15,7 +15,7 @@ files = ["LogWindow.cpp",
|
||||||
"RegisterView.cpp",
|
"RegisterView.cpp",
|
||||||
"JitWindow.cpp",
|
"JitWindow.cpp",
|
||||||
]
|
]
|
||||||
wxenv = env.Copy()
|
wxenv = env.Clone()
|
||||||
wxenv.Append(
|
wxenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([
|
CXXFLAGS = ' ' + ' '.join([
|
||||||
'`wx-config --cppflags`',
|
'`wx-config --cppflags`',
|
||||||
|
|
|
@ -20,7 +20,7 @@ libs = [
|
||||||
'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
|
'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
|
||||||
]
|
]
|
||||||
|
|
||||||
wxenv = env.Copy()
|
wxenv = env.Clone()
|
||||||
wxenv.Append(
|
wxenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([
|
CXXFLAGS = ' ' + ' '.join([
|
||||||
'`wx-config --cppflags`',
|
'`wx-config --cppflags`',
|
||||||
|
|
|
@ -12,6 +12,6 @@ files = [
|
||||||
"Profiler.cpp",
|
"Profiler.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
env_common = env.Copy()
|
env_common = env.Clone()
|
||||||
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
|
env_common.Append(CXXFLAGS = ' ' + ' '.join([ '-fPIC' ]))
|
||||||
env_common.StaticLibrary("videocommon", files)
|
env_common.StaticLibrary("videocommon", files)
|
||||||
|
|
|
@ -18,7 +18,7 @@ files = [
|
||||||
"UCodes/UCode_Zelda.cpp",
|
"UCodes/UCode_Zelda.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
dspenv = env.Copy()
|
dspenv = env.Clone()
|
||||||
dspenv.Append(
|
dspenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
||||||
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
||||||
|
|
|
@ -17,7 +17,7 @@ files = [
|
||||||
"main.cpp",
|
"main.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
dspenv = env.Copy()
|
dspenv = env.Clone()
|
||||||
dspenv.Append(
|
dspenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
CXXFLAGS = ' ' + ' '.join([ '-fPIC', '`pkg-config --cflags ao`' ]),
|
||||||
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
LINKFLAGS = ' ' + ' '.join([ '`pkg-config --libs ao`' ])
|
||||||
|
|
|
@ -10,5 +10,5 @@ files = [
|
||||||
"main.cpp",
|
"main.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
padenv = env.Copy()
|
padenv = env.Clone()
|
||||||
padenv.SharedLibrary(output, files, LIBS=["common"])
|
padenv.SharedLibrary(output, files, LIBS=["common"])
|
||||||
|
|
|
@ -59,7 +59,7 @@ if useSDL:
|
||||||
compileFlags += [ '`sdl-config --cflags`', '-DUSE_SDL=1' ]
|
compileFlags += [ '`sdl-config --cflags`', '-DUSE_SDL=1' ]
|
||||||
linkFlags += [ '`sdl-config --libs`' ]
|
linkFlags += [ '`sdl-config --libs`' ]
|
||||||
|
|
||||||
gfxenv = env.Copy()
|
gfxenv = env.Clone()
|
||||||
gfxenv.Append(
|
gfxenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join(compileFlags),
|
CXXFLAGS = ' ' + ' '.join(compileFlags),
|
||||||
LINKFLAGS = ' ' + ' '.join(linkFlags)
|
LINKFLAGS = ' ' + ' '.join(linkFlags)
|
||||||
|
|
|
@ -10,7 +10,7 @@ files = [
|
||||||
"Wiimote_Test.cpp",
|
"Wiimote_Test.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
padenv = env.Copy()
|
padenv = env.Clone()
|
||||||
padenv.Append(
|
padenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([
|
CXXFLAGS = ' ' + ' '.join([
|
||||||
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
|
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
|
||||||
|
|
|
@ -12,7 +12,7 @@ files = [
|
||||||
"GUI/ConfigBox.cpp",
|
"GUI/ConfigBox.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
padenv = env.Copy()
|
padenv = env.Clone()
|
||||||
padenv.Append(
|
padenv.Append(
|
||||||
CXXFLAGS = ' ' + ' '.join([
|
CXXFLAGS = ' ' + ' '.join([
|
||||||
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
|
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
|
||||||
|
|
Loading…
Reference in New Issue