diff options
| author | Tony Puccinelli | 2010-07-28 00:08:32 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-07-28 00:08:32 +0000 |
| commit | e8fc5f207093e8a0518dca5d815233e912945e2d (patch) | |
| tree | 629bc92fa3cb6fcd8ee8853d6dffe08eb5b84a46 /backends/plugins | |
| parent | 58f3e81f0073f55a892802b562081300345ca23d (diff) | |
| download | scummvm-rg350-e8fc5f207093e8a0518dca5d815233e912945e2d.tar.gz scummvm-rg350-e8fc5f207093e8a0518dca5d815233e912945e2d.tar.bz2 scummvm-rg350-e8fc5f207093e8a0518dca5d815233e912945e2d.zip | |
various manual tweaks to get ds port compiling from branch again after earlier merge from trunk
svn-id: r51398
Diffstat (limited to 'backends/plugins')
| -rw-r--r-- | backends/plugins/ds/ds-provider.cpp | 2 | ||||
| -rw-r--r-- | backends/plugins/elf-loader.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp index 53987ff3fa..ef3864003b 100644 --- a/backends/plugins/ds/ds-provider.cpp +++ b/backends/plugins/ds/ds-provider.cpp @@ -29,7 +29,7 @@ #include "backends/plugins/dynamic-plugin.h" #include "common/fs.h" -#include "backends/platform/ds/arm9/source/dsloader.h" +#include "backends/plugins/elf-loader.h" class DSPlugin : public DynamicPlugin { diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf-loader.cpp index eae8bebcc7..afb69714fa 100644 --- a/backends/plugins/elf-loader.cpp +++ b/backends/plugins/elf-loader.cpp @@ -37,6 +37,10 @@ #include "common/fs.h" #include "elf-loader.h" +#ifdef __DS__ +#include <nds.h> +#endif + #define __DEBUG_PLUGINS__ #ifdef __DEBUG_PLUGINS__ @@ -48,7 +52,7 @@ #define seterror(x,...) printf(x, ## __VA_ARGS__) /** - * Flushes the data cache. + * Flushes the data cache (Platform Specific). */ void flushDataCache() { #ifdef __DS__ @@ -304,7 +308,7 @@ void DLObject::relocateSymbols(Elf32_Addr offset) { #else // Make sure we don't relocate special valued symbols if (s->st_shndx < SHN_LOPROC) { - relocCount++; + mainCount++; s->st_value += offset; if (s->st_value < (Elf32_Addr)_segment || s->st_value > (Elf32_Addr)_segment + _segmentSize) seterror("Symbol out of bounds! st_value = %x\n", s->st_value); |