notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework sr
[picodrive.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
dfd8ff5
..
042c1f7
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-18,13
+18,14
@@
use_drz80 = 0
use_cz80 = 0
use_sh2drc = 0
use_sh2mame = 0
use_cz80 = 0
use_sh2drc = 0
use_sh2mame = 0
+use_svpdrc = 0
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
-asm_cdpico = 0
asm_cdmemory = 0
asm_cdmemory = 0
+asm_mix = 0
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
@@
-33,21
+34,29
@@
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_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
use_cz80 = 1
use_sh2mame = 1
endif
else
use_fame = 1
use_cz80 = 1
use_sh2mame = 1
endif
+# PD is currently not strict aliasing safe
+LOCAL_CFLAGS += -fno-strict-aliasing
+
# sources
SRCS_COMMON :=
DEFINES :=
# sources
SRCS_COMMON :=
DEFINES :=
@@
-56,6
+65,7
@@
include $(R)platform/common/common.mak
LOCAL_SRC_FILES += $(SRCS_COMMON)
LOCAL_SRC_FILES += $(R)platform/libretro.c
LOCAL_SRC_FILES += $(SRCS_COMMON)
LOCAL_SRC_FILES += $(R)platform/libretro.c
+LOCAL_SRC_FILES += $(R)platform/common/mp3.c
LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
# zlib/unzip
LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
# zlib/unzip
@@
-64,12
+74,13
@@
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)
$(R)platform/linux
+LOCAL_C_INCLUDES += $(R)
+# note: don't use -O3, causes some NDKs run out of memory while compiling FAME
+LOCAL_CFLAGS += -Wall -O2 -ffast-math -DNDEBUG
LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
-LOCAL_CFLAGS += -Wall -O3 -ffast-math -DNDEBUG
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)