notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #18 from AkimanBengus/master
[picodrive.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
dfd8ff5
..
a59144a
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-2,11
+2,7
@@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
-ifeq ($(NEON_BUILD)$(TARGET_ARCH_ABI),1armeabi-v7a)
- LOCAL_MODULE := retro_picodrive-neon
-else
- LOCAL_MODULE := retro_picodrive
-endif
+LOCAL_MODULE := retro
R := ../
FR := $(LOCAL_PATH)/$(R)
R := ../
FR := $(LOCAL_PATH)/$(R)
@@
-18,6
+14,7
@@
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_memory = 0
asm_render = 0
@@
-25,6
+22,7
@@
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
+asm_mix = 0
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
@@
-35,6
+33,7
@@
ifeq ($(TARGET_ARCH),arm)
use_cyclone = 1
use_drz80 = 1
use_sh2drc = 1
use_cyclone = 1
use_drz80 = 1
use_sh2drc = 1
+ use_svpdrc = 1
asm_memory = 1
asm_render = 1
asm_memory = 1
asm_render = 1
@@
-42,6
+41,7
@@
ifeq ($(TARGET_ARCH),arm)
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
+ asm_mix = 1
else
use_fame = 1
use_cz80 = 1
else
use_fame = 1
use_cz80 = 1
@@
-55,7
+55,8
@@
ARCH := $(TARGET_ARCH)
include $(R)platform/common/common.mak
LOCAL_SRC_FILES += $(SRCS_COMMON)
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
# zlib/unzip
LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
# zlib/unzip
@@
-66,10
+67,11
@@
LOCAL_SRC_FILES += $(R)zlib/gzio.c $(R)zlib/inffast.c $(R)zlib/inflate.c \
LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.c
LOCAL_SRC_FILES += $(R)unzip/unzip.c $(R)unzip/unzip_stream.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 -DINLINE=inline
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)