From dee3a94edb31049e908cdba347edfbf0c6a654c8 Mon Sep 17 00:00:00 2001
From: Twinaphex
Date: Tue, 9 Dec 2014 22:48:03 +0100
Subject: Start adding ARCH_ARM rules

---
 Makefile        | 5 +++++
 Makefile.common | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d516ece..1a6e733 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,7 @@ else ifeq ($(platform), ios)
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
+	CPU_ARCH := arm
 
 	ifeq ($(IOSSDK),)
 		IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path)
@@ -211,6 +212,10 @@ OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
 
 DEFINES = -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DPC_BUILD -Wall
 
+ifeq ($(CPU_ARCH), arm)
+DEFINES += -DARM_ARCH
+endif
+
 WARNINGS_DEFINES =
 CODE_DEFINES =
 
diff --git a/Makefile.common b/Makefile.common
index 6a371be..259e4c3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -23,7 +23,7 @@ SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S
 endif
 ifeq ($(CPU_ARCH), arm)
 SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \
-					$(CORE_DIR)/arm/video_blend.S
+	$(CORE_DIR)/arm/video_blend.S
 endif
 
 INCFLAGS := -I$(CORE_DIR)
-- 
cgit v1.2.3