From bd2fb238b65cf182fbb2f3d71696ce6592dc37b1 Mon Sep 17 00:00:00 2001 From: nakeee Date: Fri, 12 Sep 2008 09:59:10 +0000 Subject: [PATCH] changed lzo to minilzo, fixing compile on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@498 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/LZO/SConscript | 4 ++-- Source/Core/Core/Src/SConscript | 2 +- Source/Core/DolphinWX/Src/SConscript | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals/LZO/SConscript b/Externals/LZO/SConscript index 5314a54af1..75b0dca2ab 100644 --- a/Externals/LZO/SConscript +++ b/Externals/LZO/SConscript @@ -10,8 +10,8 @@ def filterWarnings(flags): for flag in flags.split() if not flag.startswith('-W') ) -env_lzo = env.Copy( +env_lzo = env.Clone( CCFLAGS = filterWarnings(env['CCFLAGS']), CXXFLAGS = filterWarnings(env['CXXFLAGS']), ) -env_lzo.StaticLibrary("lzo", files) +env_lzo.StaticLibrary("minilzo", files) diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 9441050fbf..6b4117f444 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -87,7 +87,7 @@ files = ["Console.cpp", "HLE/HLE_OS.cpp", ] libs = [ - 'lzo', 'bdisasm' + 'bdisasm' ] env.StaticLibrary("core", files, LIBS=libs) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 812fbf841e..c37f148fc4 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -17,7 +17,7 @@ files = [ 'cmdline.c', ] libs = [ - 'debwx', 'core', 'lzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' + 'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' ] wxenv = env.Copy()