From 657c7bee5cb874c17716d3597969a4cba26e2769 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 11 Dec 2014 19:12:09 +0100
Subject: [PATCH] Create define ARM_ARCH_BLENDING_OPTS - so that we can
 optionally compile in the ARM ASM blend file

---
 Makefile.common | 3 +++
 video.c         | 5 ++---
 video.h         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index faf0261..3a42edc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -33,7 +33,10 @@ endif
 endif
 
 ifeq ($(CPU_ARCH), arm)
+ifeq ($(CPU_ARCH_ARM_BLENDING_OPTS),1)
+CFLAGS += -DARM_ARCH_BLENDING_OPTS
 SOURCES_ASM += $(CORE_DIR)/arm/video_blend.S
 endif
+endif
 
 INCFLAGS := -I$(CORE_DIR)
diff --git a/video.c b/video.c
index e8b47b4..cd58760 100644
--- a/video.c
+++ b/video.c
@@ -2296,8 +2296,7 @@ fill_line_builder(color32);
 
 #ifdef RENDER_COLOR16_NORMAL
 
-#ifndef ARM_ARCH
-
+#ifndef ARM_ARCH_BLENDING_OPTS
 void expand_normal(u16 *screen_ptr, u32 start, u32 end)
 {
   u32 i, pixel_source;
@@ -2328,7 +2327,7 @@ void expand_normal(u16 *screen_ptr, u32 start, u32 end)
 void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr,
  u32 start, u32 end);
 
-#ifndef ARM_ARCH
+#ifndef ARM_ARCH_BLENDING_OPTS
 
 void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr,
  u32 start, u32 end)
diff --git a/video.h b/video.h
index 3337f1d..df95fcd 100644
--- a/video.h
+++ b/video.h
@@ -20,7 +20,7 @@
 #ifndef VIDEO_H
 #define VIDEO_H
 
-void update_scanline();
+void update_scanline(void);
 void video_write_savestate(void);
 void video_read_savestate(void);