diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-02-22 00:39:38 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-02-22 00:39:38 +0000 |
| commit | 73d575c5c2fe6bf15e29055a438dae8ae7aa0489 (patch) | |
| tree | 2aed1678fa0a209fa61ef1db1451dbc951726729 /Source/Core | |
| parent | 74a6b5638f5e3159b2112dde514da4a23bf5605b (diff) | |
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
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/SConscript | 6 | ||||
| -rw-r--r-- | Source/Core/Core/Src/State.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 7 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/HiresTextures.cpp | 4 |
4 files changed, 17 insertions, 4 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" |