diff options
| author | twinaphex | 2012-12-02 18:06:01 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-02 18:06:01 +0100 |
| commit | 1cb2b455712a0c9ae814b441a5a46e24e32a808c (patch) | |
| tree | a355bc7e46c9577f358281259e32024100ac6d6a /jni | |
| parent | 01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (diff) | |
| parent | a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 (diff) | |
| download | pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.gz pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.bz2 pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 6be42b1..89af335 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -19,12 +19,6 @@ endif ifeq ($(TARGET_ARCH),arm) LOCAL_ARM_MODE := arm - ifeq ($(TARGET_ARCH_EABI),armeabi-v7a) - LOCAL_CFLAGS += -DHAVE_ARMV7=1 - else - LOCAL_CFLAGS += -DHAVE_ARMV7=0 - endif - LOCAL_CFLAGS += -DANDROID_ARM LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S @@ -89,16 +83,14 @@ LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c # dfinput LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c -# gui +# misc LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c -LOCAL_SRC_FILES += ../frontend/common/fonts.c -LOCAL_SRC_FILES += ../frontend/linux/plat.c # libretro LOCAL_SRC_FILES += ../frontend/libretro.c LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../frontend +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_LDLIBS := -lz -llog include $(BUILD_SHARED_LIBRARY) |