diff options
| author | Johannes Schickel | 2010-12-22 15:09:42 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-12-22 15:09:42 +0000 |
| commit | 0134ffd86ef46da8f9311b284ecdd0c5a9fe0957 (patch) | |
| tree | 9462c27258a3e62e24bf60e5e825b6514125a737 /backends/plugins | |
| parent | 48ce90419f48fe1c3e8f3f0336aae3445e850ea9 (diff) | |
| download | scummvm-rg350-0134ffd86ef46da8f9311b284ecdd0c5a9fe0957.tar.gz scummvm-rg350-0134ffd86ef46da8f9311b284ecdd0c5a9fe0957.tar.bz2 scummvm-rg350-0134ffd86ef46da8f9311b284ecdd0c5a9fe0957.zip | |
PLUGINS: Only enable ELFMemoryManager when dynamic plugins and the ELF loader is enabled.
This should fix compilation on desktop systems, where for example memalign
is not present.
svn-id: r55011
Diffstat (limited to 'backends/plugins')
| -rw-r--r-- | backends/plugins/elf/memory-manager.cpp | 8 | ||||
| -rw-r--r-- | backends/plugins/elf/memory-manager.h | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp index 6e573088e2..7c6cdd328d 100644 --- a/backends/plugins/elf/memory-manager.cpp +++ b/backends/plugins/elf/memory-manager.cpp @@ -24,8 +24,11 @@ */ #include "common/scummsys.h" -#include "common/util.h" + +#if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) + #include "backends/plugins/elf/memory-manager.h" +#include "common/util.h" DECLARE_SINGLETON(ELFMemoryManager); @@ -166,3 +169,6 @@ void ELFMemoryManager::deallocateFromHeap(void *ptr) { } } } + +#endif /* defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) */ + diff --git a/backends/plugins/elf/memory-manager.h b/backends/plugins/elf/memory-manager.h index 81f8ea9a3e..c190f5f593 100644 --- a/backends/plugins/elf/memory-manager.h +++ b/backends/plugins/elf/memory-manager.h @@ -26,6 +26,10 @@ #ifndef ELF_MEMORY_MANAGER_H #define ELF_MEMORY_MANAGER_H +#include "common/scummsys.h" + +#if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) + #include "common/singleton.h" #include "common/list.h" #include "common/mutex.h" @@ -80,4 +84,6 @@ private: uint32 _bytesAllocated; }; +#endif /* defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) */ + #endif /* ELF_MEMORY_MANAGER_H */ |