On linux don't compile and link against lzo, soil, and sfml "Externals."

Instead use system libraries liblzo2-dev, libsoil-dev, and libsfml-dev


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5105 8ced0084-cf51-0410-be5f-012b33b47a6e

6 files changed, 23 insertions, 6 deletions

diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 5c2c2b2aae..d8e3760490 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -137,9 +137,11 @@ else:
 libs = [
 	'bdisasm',
         'inputcommon',
-	'lua',
-        'sfml'
+	'lua'
 	]
 
+if sys.platform == 'darwin':
+    libs = ['sfml-network'] + libs
+
 env_core = env.Clone();
 env_core.StaticLibrary(env['local_libs'] + 'core', files, LIBS=libs)
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 85920c9e24..17933bde51 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -31,7 +31,11 @@
 
 #include <string>
 
+#ifdef __linux__
+#include <lzo/lzo1x.h>
+#else
 #include "minilzo.h"
+#endif
 
 // TODO: Move to namespace
 
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 6dfeb54bf8..161f4ed4b7 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -11,10 +11,13 @@ files = [
 	]
 
 libs = [
-	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 
-	'inputcommon', 'common', 'lua', 'z', 'sfml'
+	'core', 'discio', 'bdisasm', 'videocommon', 
+	'inputcommon', 'common', 'lua', 'z'
 	]
 
+if sys.platform == 'darwin':
+	libs = ['sfml-network', 'minilzo'] + libs
+
 if wxenv['HAVE_WX']:
 	files += [
 		'AboutDolphin.cpp',
diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
index 4539e54357..e973e8d49f 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp
@@ -20,7 +20,11 @@
 #include <cstring>
 #include <utility>
 #include <algorithm>
+#ifdef __linux__
+#include <SOIL/SOIL.h>
+#else
 #include "SOIL.h"
+#endif
 #include "CommonPaths.h"
 #include "FileUtil.h"
 #include "FileSearch.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index d670d8b1f8..d72fe0643e 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -31,8 +31,10 @@ compileFlags = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'soil', 'common'
+	'videocommon', 'common'
 	]
+if sys.platform == 'darwin':
+	libs = ['SOIL'] + libs
 
 gfxenv = env.Clone()
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
index 88f959d102..b9493cb3ef 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
@@ -42,8 +42,10 @@ compileFlags = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'soil', 'common'
+	'videocommon', 'common'
 	]
+if sys.platform == 'darwin':
+	libs = ['SOIL'] + libs
 
 gfxenv = env.Clone()