X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=bc8170266fdb530db9b3a86d688f0365291bbb3e;hb=b5f5dc1fad9a7876a2d146b1c61d06e64435a86e;hp=042c1f7433f916003006c196bef56166769d3548;hpb=20a10d3ed94e12bfc0f415e186f0da5bc4efac49;p=picodrive.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 042c1f7..bc81702 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,12 +2,13 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq ($(NEON_BUILD)$(TARGET_ARCH_ABI),1armeabi-v7a)
-  LOCAL_MODULE := retro_picodrive-neon
-else
-  LOCAL_MODULE := retro_picodrive
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
+LOCAL_MODULE := retro
+
 R := ../
 FR := $(LOCAL_PATH)/$(R)
 
@@ -48,6 +49,13 @@ ifeq ($(TARGET_ARCH),arm)
   asm_misc = 1
 #  asm_cdmemory = 1 # texrels
   asm_mix = 1
+
+# for armeabi to build...
+CYCLONE_CONFIG = cyclone_config_armv4.h
+
+$(cleantarget)::
+	$(MAKE) -C $(FR)cpu/cyclone/ clean
+
 else
   use_fame = 1
   use_cz80 = 1
@@ -64,7 +72,7 @@ ARCH := $(TARGET_ARCH)
 include $(R)platform/common/common.mak
 
 LOCAL_SRC_FILES += $(SRCS_COMMON)
-LOCAL_SRC_FILES += $(R)platform/libretro.c
+LOCAL_SRC_FILES += $(R)platform/libretro/libretro.c
 LOCAL_SRC_FILES += $(R)platform/common/mp3.c
 LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c