diff options
| author | dhewg | 2011-04-23 03:28:26 +0200 |
|---|---|---|
| committer | dhewg | 2011-04-23 03:39:37 +0200 |
| commit | 983b044ccb9b82eabd8d3b667822c3693ddb4e6d (patch) | |
| tree | 50db690f4b99a71e1dae877a4d0becb86ec23446 /engines | |
| parent | b4f8a63171967814d43a1e3883055b03f6d5b8ac (diff) | |
| download | scummvm-rg350-983b044ccb9b82eabd8d3b667822c3693ddb4e6d.tar.gz scummvm-rg350-983b044ccb9b82eabd8d3b667822c3693ddb4e6d.tar.bz2 scummvm-rg350-983b044ccb9b82eabd8d3b667822c3693ddb4e6d.zip | |
ARM: Global symbols get an underscore prefix on darwin
apply same solution as for the sound/smush ARM asm here
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/costume.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/gfx.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/gfxARM.s | 8 | ||||
| -rw-r--r-- | engines/scumm/proc3ARM.s | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index cd366fcfd4..d0a3ec6e11 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -419,6 +419,11 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) { #undef MASK_AT #ifdef USE_ARM_COSTUME_ASM + +#ifndef IPHONE +#define ClassicProc3RendererShadowARM _ClassicProc3RendererShadowARM +#endif + extern "C" int ClassicProc3RendererShadowARM(int _scaleY, ClassicCostumeRenderer::Codec1 *v1, Graphics::Surface *_out, diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index a6a97ec426..80c13d30e3 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -36,6 +36,12 @@ #include "scumm/util.h" #ifdef USE_ARM_GFX_ASM + +#ifndef IPHONE +#define asmDrawStripToScreen _asmDrawStripToScreen +#define asmCopy8Col _asmCopy8Col +#endif + extern "C" void asmDrawStripToScreen(int height, int width, void const* text, void const* src, byte* dst, int vsPitch, int vmScreenWidth, int textSurfacePitch); extern "C" void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height, uint8 bitDepth); diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s index 34de954a17..9f7c2949b3 100644 --- a/engines/scumm/gfxARM.s +++ b/engines/scumm/gfxARM.s @@ -25,8 +25,8 @@ .text - .global asmDrawStripToScreen - .global asmCopy8Col + .global _asmDrawStripToScreen + .global _asmCopy8Col @ ARM implementation of asmDrawStripToScreen. @ @@ -44,7 +44,7 @@ @ In addition, we assume that text, src and dst are all word (4 byte) @ aligned. This is the same assumption that the old 'inline' version @ made. -asmDrawStripToScreen: +_asmDrawStripToScreen: @ r0 = height @ r1 = width @ r2 = text @@ -125,7 +125,7 @@ end: @ In addition, we assume that src and dst are both word (4 byte) @ aligned. This is the same assumption that the old 'inline' version @ made. -asmCopy8Col: +_asmCopy8Col: @ r0 = dst @ r1 = dstPitch @ r2 = src diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s index 646142ab1f..5acfa86c29 100644 --- a/engines/scumm/proc3ARM.s +++ b/engines/scumm/proc3ARM.s @@ -25,7 +25,7 @@ .text - .global ClassicProc3RendererShadowARM + .global _ClassicProc3RendererShadowARM .set _scaleIndexY , 112 @@ -71,7 +71,7 @@ @ <> = _palette @ <> = _numstrips @ <> = _scaleIndexY -ClassicProc3RendererShadowARM: +_ClassicProc3RendererShadowARM: @ shadow20 = false @ shadowed = true @ unscaled = false |