X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=06b437957f9b690bfb813a45398a95a705fd0086;hb=f5cea0386cabbfe8db679bea08975d3289f34032;hp=81b885dab208d73e6f40b3461ba3d3d7b8f97a6a;hpb=159dc8eed41f86f841d7b0178ed6a015e8019a5e;p=pcsx_rearmed.git diff --git a/jni/Android.mk b/jni/Android.mk index 81b885da..06b43795 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -19,15 +19,9 @@ endif ifeq ($(TARGET_ARCH),arm) LOCAL_ARM_MODE := arm - ifeq ($(TARGET_ARCH_EABI),armeabi-v7a) - LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=1 - else - LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=0 - endif - LOCAL_CFLAGS += -DANDROID_ARM - LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.s + LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S # dynarec LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/linkage_arm.S ../libpcsxcore/new_dynarec/emu_if.c ../libpcsxcore/new_dynarec/pcsxmem.c @@ -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_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_LDLIBS := -lz -llog include $(BUILD_SHARED_LIBRARY)