diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-03-09 22:17:33 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-03-09 22:17:33 +0000 |
| commit | c455673f8705d9035b939edab682e2e246edf94e (patch) | |
| tree | e590ee8dad4db25be532f1a47098234d51dfe91b /Source/Core | |
| parent | 914cb632fbfbbe56102881f4cbf1d5c755d91e31 (diff) | |
Added scons options "shared_libname=true" to link agains the system shared libraries for lzo, sfml, and soil. For example add the scons option "shared_lzo=true" for lzo. This will check for the system libraries and then fall back to building and linking statically against the Externals if not found. You must have liblzo2-dev, libsoil-dev, and libsfml-dev installed. Note that you need version 1.5 or later for sfml. Currently scons doesn't check the version for you.
If you are having trouble with segmentation faults in linux try "shared_soil=true". That seems to fix the problem. How do we fix this for the static build?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5182 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/SConscript | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/State.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/HiresTextures.cpp | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 5c2c2b2aae..8b5ee229f7 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -138,7 +138,7 @@ libs = [ 'bdisasm', 'inputcommon', 'lua', - 'sfml' + 'sfml-network' ] env_core = env.Clone(); diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 85920c9e24..0b62fca92b 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -31,7 +31,11 @@ #include <string> +#if defined(SHARED_LZO) && SHARED_LZO +#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..2605c736fb 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -11,8 +11,8 @@ files = [ ] libs = [ - 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', - 'inputcommon', 'common', 'lua', 'z', 'sfml' + 'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', + 'inputcommon', 'common', 'lua', 'z', 'sfml-network' ] if wxenv['HAVE_WX']: diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp index 4539e54357..50040d2fd3 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> +#if defined(SHARED_SOIL) && SHARED_SOIL +#include <SOIL/SOIL.h> +#else #include "SOIL.h" +#endif #include "CommonPaths.h" #include "FileUtil.h" #include "FileSearch.h" |