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

Externals/SFML/src/SConscript

@@ -19,4 +19,4 @@ env_sfml = env.Clone(
 	CXXFLAGS = env.filterWarnings(env['CXXFLAGS']),
 	)
 
-env_sfml.StaticLibrary(env['local_libs'] + "sfml-network", files)
+env_sfml.StaticLibrary(env['local_libs'] + "sfml", files)

Externals/SOIL/SConscript

@@ -15,4 +15,4 @@ env_soil = env.Clone(
 	parse_flags = ['-fPIC']
 	)
 
-env_soil.StaticLibrary(env['local_libs'] + "libSOIL", files)
+env_soil.StaticLibrary(env['local_libs'] + "libsoil", files)

SConstruct

@@ -50,7 +50,10 @@ include_paths = [
     basedir + 'Source/Core/Core/Src',
     basedir + 'Source/Core/DebuggerWX/Src',
     basedir + 'Externals/Bochs_disasm',
+    basedir + 'Externals/LZO',
+    basedir + 'Externals/SOIL',
     basedir + 'Externals/Lua',
+    basedir + 'Externals/SFML/include',
     basedir + 'Externals/WiiUseSrc/Src',
     basedir + 'Source/Core/VideoCommon/Src',
     basedir + 'Source/Core/InputCommon/Src',
@@ -59,15 +62,11 @@ include_paths = [
     basedir + 'Source/Core/DSPCore/Src',
     ]
 
-if sys.platform == 'darwin':
-    include_paths += [
-        basedir + 'Externals/LZO', # TODO:  Macs have port of lzo, use that instead
-        basedir + 'Externals/SOIL',
-        basedir + 'Externals/SFML/include',
-        ]
-
 dirs = [
     'Externals/Bochs_disasm',
+    'Externals/LZO',
+    'Externals/SOIL',
+    'Externals/SFML/src',
     'Externals/Lua',
     'Externals/WiiUseSrc/Src', 
     'Source/Core/Common/Src',
@@ -89,13 +88,6 @@ dirs = [
     'Source/Core/DebuggerWX/Src',
     ]
 
-if sys.platform == 'darwin':
-    dirs += [
-        'Externals/LZO', # TODO:  Macs have port of lzo, use that instead
-        'Externals/SOIL',
-        'Externals/SFML/src',
-        ]
-
 builders = {}
 if sys.platform == 'darwin':
     from plistlib import writePlist
@@ -346,13 +338,7 @@ if sys.platform == 'darwin':
 else:
     env['HAVE_X11'] = conf.CheckPKG('x11')
     env['HAVE_COCOA'] = 0
-    # SOIL
-    env['HAVE_SOIL'] = conf.CheckPKG('SOIL')
-    # LZO
-    env['HAVE_LZO'] = conf.CheckPKG('lzo2')
-    # sfml
-    env['HAVE_SFML'] = conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp")
-
+   
 # handling wx flags CCFLAGS should be created before
 wxmods = ['aui', 'adv', 'core', 'base']
 

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"

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -31,10 +31,8 @@ compileFlags = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'common'
+	'videocommon', 'soil', 'common'
 	]
-if sys.platform == 'darwin':
-	libs = ['SOIL'] + libs
 
 gfxenv = env.Clone()
 

Source/Plugins/Plugin_VideoSoftware/Src/SConscript

@@ -42,10 +42,8 @@ compileFlags = [
 linkFlags = [
 	]
 libs = [
-	'videocommon', 'common'
+	'videocommon', 'soil', 'common'
 	]
-if sys.platform == 'darwin':
-	libs = ['SOIL'] + libs
 
 gfxenv = env.Clone()