summaryrefslogtreecommitdiff
path: root/arm
diff options
context:
space:
mode:
authortwinaphex2014-12-11 19:03:08 +0100
committertwinaphex2014-12-11 19:03:08 +0100
commit8d7b204c2bdb742af4083df0fe0e110afe5c3def (patch)
tree2b2abb8fc9dea2af0a73915076c5edd999ad0c13 /arm
parent5b59ef3acc721639ebc1c78ab42fe64f4e30ab6d (diff)
downloadpicogpsp-8d7b204c2bdb742af4083df0fe0e110afe5c3def.tar.gz
picogpsp-8d7b204c2bdb742af4083df0fe0e110afe5c3def.tar.bz2
picogpsp-8d7b204c2bdb742af4083df0fe0e110afe5c3def.zip
(ARM ASM) Add __MACH__ hack to get iOS port linking for now
Diffstat (limited to 'arm')
-rw-r--r--arm/video_blend.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/arm/video_blend.S b/arm/video_blend.S
index 714fe4c..56d9953 100644
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -5,8 +5,13 @@
@ r3 = end
6:
+#ifdef __MACH__
+ .word _io_registers
+ .word _palette_ram_converted
+#else
.word io_registers
.word palette_ram_converted
+#endif
.word 0x04000200 @ combine test mask
.word 0x07E0F81F @ clamp mask
.word 0x000003FE @ palette index mask