Revert commit 5105 until we sort out how we want this to work in linux.

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

Source/Core/Core/Src/SConscript

@@ -137,11 +137,9 @@ else:
 libs = [
 	'bdisasm',
         'inputcommon',
-	'lua'
+	'lua',
+        'sfml'
 	]
 
-if sys.platform == 'darwin':
-    libs = ['sfml-network'] + libs
-
 env_core = env.Clone();
 env_core.StaticLibrary(env['local_libs'] + 'core', files, LIBS=libs)

Source/Core/Core/Src/State.cpp

@@ -31,11 +31,7 @@
 
 #include <string>
 
-#ifdef __linux__
-#include <lzo/lzo1x.h>
-#else
 #include "minilzo.h"
-#endif
 
 // TODO: Move to namespace
 

Source/Core/DolphinWX/Src/SConscript

@@ -11,13 +11,10 @@ files = [
 	]
 
 libs = [
-	'core', 'discio', 'bdisasm', 'videocommon', 
-	'inputcommon', 'common', 'lua', 'z'
+	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 
+	'inputcommon', 'common', 'lua', 'z', 'sfml'
 	]
 
-if sys.platform == 'darwin':
-	libs = ['sfml-network', 'minilzo'] + libs
-
 if wxenv['HAVE_WX']:
 	files += [
 		'AboutDolphin.cpp',

Source/Core/VideoCommon/Src/HiresTextures.cpp

@@ -20,11 +20,7 @@
 #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"