notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update jni/Android.mk
[picodrive.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
60d6f7d
..
e322752
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-2,6
+2,11
@@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
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
#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
@@
-23,7
+28,6
@@
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
-asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
asm_cdmemory = 0
asm_mix = 0
@@
-34,16
+38,19
@@
ifeq ($(TARGET_ARCH),arm)
endif
use_cyclone = 1
endif
use_cyclone = 1
- use_drz80 = 1
+
+ # texrels, -perf ~~8%
+ use_drz80 = 0
+ use_cz80 = 1
+
use_sh2drc = 1
use_svpdrc = 1
use_sh2drc = 1
use_svpdrc = 1
- asm_memory = 1
+# asm_memory = 1 # texrels, -perf negligible
asm_render = 1
asm_render = 1
- asm_ym2612 = 1
+# asm_ym2612 = 1 # texrels, -perf ~~4%
asm_misc = 1
asm_misc = 1
- asm_cdpico = 1
- asm_cdmemory = 1
+# asm_cdmemory = 1 # texrels
asm_mix = 1
else
use_fame = 1
asm_mix = 1
else
use_fame = 1
@@
-51,6
+58,9
@@
else
use_sh2mame = 1
endif
use_sh2mame = 1
endif
+# PD is currently not strict aliasing safe
+LOCAL_CFLAGS += -fno-strict-aliasing
+
# sources
SRCS_COMMON :=
DEFINES :=
# sources
SRCS_COMMON :=
DEFINES :=
@@
-68,7
+78,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
$(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)
LOCAL_C_INCLUDES += $(R)