fix android build

[picodrive.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 60d6f7d..05b2a37 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,6 +2,11 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+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
 
@@ -51,6 +56,9 @@ else
   use_sh2mame = 1
 endif
 
+# PD is currently not strict aliasing safe
+LOCAL_CFLAGS += -fno-strict-aliasing
+
 # sources
 SRCS_COMMON :=
 DEFINES :=
@@ -68,7 +76,7 @@ LOCAL_SRC_FILES += $(R)zlib/gzio.c $(R)zlib/inffast.c $(R)zlib/inflate.c \
        $(R)zlib/crc32.c $(R)zlib/adler32.c $(R)zlib/zutil.c \
        $(R)zlib/compress.c $(R)zlib/uncompr.c
 
-LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.c
+LOCAL_SRC_FILES += $(R)unzip/unzip.c
 
 LOCAL_C_INCLUDES += $(R)