From c0eae9a4dc18f0ef934f46d1ba7b5ab1a4388b47 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 2 Dec 2012 17:37:12 +0100 Subject: [PATCH] (Android) Define ARM mode for ARM targets - define ALIGN_WORD and ALIGN_LONG to prevent crashes --- libretro/jni/Android.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index 73d6953..5bae7b7 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -6,6 +6,12 @@ GENPLUS_SRC_DIR := ../../source LIBRETRO_DIR := ../ LOCAL_MODULE := retro + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DANDROID_ARM +LOCAL_ARM_MODE := arm +endif + LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \ $(GENPLUS_SRC_DIR)/vdp_ctrl.c \ $(GENPLUS_SRC_DIR)/vdp_render.c \ @@ -67,6 +73,6 @@ LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(GENPLUS_SRC_DIR) \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/ntsc \ $(LOCAL_PATH)/$(LIBRETRO_DIR) -LOCAL_CFLAGS = -ffast-math -O3 -funroll-loops -DINLINE="static inline" -DUSE_16BPP_RENDERING -DLSB_FIRST -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 +LOCAL_CFLAGS = -ffast-math -O3 -funroll-loops -DINLINE="static inline" -DUSE_16BPP_RENDERING -DLSB_FIRST -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD include $(BUILD_SHARED_LIBRARY)