X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=492cfc92c991b36ea92b7e4c100c5096ded869d4;hb=06d30e62f69325ebd722251d68362873ce6c487f;hp=3a5a1fe790217fae8e10b2e5e1465e46d291c6d6;hpb=d053448171c8de783da013c2642a7ee7d2482c63;p=picodrive.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 3a5a1fe..492cfc9 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,12 +2,16 @@ 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
 
+#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
+LOCAL_MODULE := retro
+
 R := ../
 FR := $(LOCAL_PATH)/$(R)
 
@@ -24,7 +28,6 @@ asm_memory = 0
 asm_render = 0
 asm_ym2612 = 0
 asm_misc = 0
-asm_cdpico = 0
 asm_cdmemory = 0
 asm_mix = 0
 
@@ -43,7 +46,6 @@ ifeq ($(TARGET_ARCH),arm)
   asm_render = 1
   asm_ym2612 = 1
   asm_misc = 1
-  asm_cdpico = 1
   asm_cdmemory = 1
   asm_mix = 1
 else
@@ -52,6 +54,9 @@ else
   use_sh2mame = 1
 endif
 
+# PD is currently not strict aliasing safe
+LOCAL_CFLAGS += -fno-strict-aliasing
+
 # sources
 SRCS_COMMON :=
 DEFINES :=