changed lzo to minilzo, fixing compile on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@498 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
ea75d5adce
commit
bd2fb238b6
|
@ -10,8 +10,8 @@ def filterWarnings(flags):
|
||||||
for flag in flags.split()
|
for flag in flags.split()
|
||||||
if not flag.startswith('-W')
|
if not flag.startswith('-W')
|
||||||
)
|
)
|
||||||
env_lzo = env.Copy(
|
env_lzo = env.Clone(
|
||||||
CCFLAGS = filterWarnings(env['CCFLAGS']),
|
CCFLAGS = filterWarnings(env['CCFLAGS']),
|
||||||
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
|
CXXFLAGS = filterWarnings(env['CXXFLAGS']),
|
||||||
)
|
)
|
||||||
env_lzo.StaticLibrary("lzo", files)
|
env_lzo.StaticLibrary("minilzo", files)
|
||||||
|
|
|
@ -87,7 +87,7 @@ files = ["Console.cpp",
|
||||||
"HLE/HLE_OS.cpp",
|
"HLE/HLE_OS.cpp",
|
||||||
]
|
]
|
||||||
libs = [
|
libs = [
|
||||||
'lzo', 'bdisasm'
|
'bdisasm'
|
||||||
]
|
]
|
||||||
|
|
||||||
env.StaticLibrary("core", files, LIBS=libs)
|
env.StaticLibrary("core", files, LIBS=libs)
|
||||||
|
|
|
@ -17,7 +17,7 @@ files = [
|
||||||
'cmdline.c',
|
'cmdline.c',
|
||||||
]
|
]
|
||||||
libs = [
|
libs = [
|
||||||
'debwx', 'core', 'lzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
|
'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
|
||||||
]
|
]
|
||||||
|
|
||||||
wxenv = env.Copy()
|
wxenv = env.Copy()
|
||||||
|
|
Loading…
Reference in New Issue