From e5a126e23187ccd5257999e93388848198fef0a6 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Fri, 12 Sep 2008 09:15:54 +0000
Subject: [PATCH] lzo compiles on linux (almost working)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@496 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Externals/LZO/SConscript             | 17 +++++++++++++++++
 SConstruct                           |  2 ++
 Source/Core/Core/Src/SConscript      |  6 +++++-
 Source/Core/DolphinWX/Src/SConscript |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 Externals/LZO/SConscript

diff --git a/Externals/LZO/SConscript b/Externals/LZO/SConscript
new file mode 100644
index 0000000000..5314a54af1
--- /dev/null
+++ b/Externals/LZO/SConscript
@@ -0,0 +1,17 @@
+Import('env')
+
+files = [
+	"minilzo.c",
+	]
+
+def filterWarnings(flags):
+        return ' '.join(
+                flag
+                for flag in flags.split()
+                if not flag.startswith('-W')
+                )
+env_lzo = env.Copy(
+        CCFLAGS = filterWarnings(env['CCFLAGS']),
+        CXXFLAGS = filterWarnings(env['CXXFLAGS']),
+        )
+env_lzo.StaticLibrary("lzo", files)
diff --git a/SConstruct b/SConstruct
index c16d39c7f0..df3345493b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -40,12 +40,14 @@ include_paths = [
 	'../../../Core/Core/Src',
 	'../../../Core/DebuggerWX/src',
 	'../../../../Externals/Bochs_disasm',
+        '../../../../Externals/LZO',
 	'../../../Core/VideoCommon/Src',
 	]
 
 dirs = [
 	"Source/Core/Common/Src",
 	"Externals/Bochs_disasm",
+        "Externals/LZO",
 	"Source/Core/Core/Src",
 	"Source/Core/DiscIO/Src",
 	"Source/Core/DebuggerWX/src",
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index fe514fdb12..9441050fbf 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -86,4 +86,8 @@ files = ["Console.cpp",
          "HLE/HLE_Misc.cpp",
          "HLE/HLE_OS.cpp",
         ]
-env.StaticLibrary("core", files, LIBS="bdisasm")
+libs = [
+	'lzo', 'bdisasm'
+	]
+
+env.StaticLibrary("core", files, LIBS=libs)
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 7fe12189a8..812fbf841e 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -17,7 +17,7 @@ files = [
         'cmdline.c',
 	]
 libs = [
-	'debwx', 'core', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'debwx', 'core', 'lzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
 
 wxenv = env.Copy()