aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorTony Puccinelli2010-08-12 23:55:12 +0000
committerTony Puccinelli2010-08-12 23:55:12 +0000
commit139a96182d2a52e25b42ec35f834f7a10f30675c (patch)
tree1b4e2a3082528cbc44ff4ec7cf4729b0bc0938f0 /backends
parentcb3acc96efe450de692f7762b30478f441d40732 (diff)
downloadscummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.tar.gz
scummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.tar.bz2
scummvm-rg350-139a96182d2a52e25b42ec35f834f7a10f30675c.zip
modified DS makefile to use new plugin design where only one plugin is loaded at a time and tested successfully on the DS. Added code to prevent a crash in the case where there are no engine plugins present. Removed code for R_ARM_TARGET1 in arm-loader, as it is no longer used and was never used successfully
svn-id: r52052
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/ds/arm9/makefile6
-rw-r--r--backends/plugins/arm-loader.cpp12
2 files changed, 3 insertions, 15 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 407df8243c..75a2e68ec5 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -1,7 +1,7 @@
srcdir ?= .
DEPDIR := .deps
-VERBOSE_BUILD = 1
+VERBOSE_BUILD = 0
DYNAMIC_MODULES = 1
libndsdir = $(DEVKITPRO)/libnds
#libndsdir = /home/neil/devkitpror21/libnds
@@ -237,7 +237,7 @@ CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder \
ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM -DARM_TARGET#-DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM -DARM_TARGET -DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT
ifdef USE_MAD
DEFINES += -DUSE_MAD
endif
@@ -364,7 +364,7 @@ semiclean:
clean:
$(RM) $(OBJS) $(EXECUTABLE)
- rm -rf *.h engines plugins scummvm.nds scummvm.ds.gba
+ rm -rf *.h engines plugins graphics gui common sound backends base map.txt scummvm.nds scummvm.ds.gba
dist : SCUMMVM.BIN plugins plugin_dist
diff --git a/backends/plugins/arm-loader.cpp b/backends/plugins/arm-loader.cpp
index 7e8269220b..d8ed083962 100644
--- a/backends/plugins/arm-loader.cpp
+++ b/backends/plugins/arm-loader.cpp
@@ -110,18 +110,6 @@ bool ARMDLObject::relocate(Common::SeekableReadStream* DLFile, unsigned long off
DBG("R_ARM_JUMP24: PC-relative jump, ld takes care of all relocation work for us.\n");
break;
- case R_ARM_TARGET1:
- if (sym->st_shndx < SHN_LOPROC) { // Only shift for plugin section.
- a = *target; // Get full 32 bits of addend
- relocation = a + (Elf32_Addr)_segment; // Shift by main offset
-
- *target = relocation;
-
- DBG("R_ARM_TARGET1: i=%d, a=%x, origTarget=%x, target=%x\n", i, a, origTarget, *target);
- DBG("Make sure --target1-abs is a flag to LD!\n");
- }
- break;
-
case R_ARM_V4BX:
DBG("R_ARM_V4BX: No relocation calculation necessary.\n");
break;