diff options
| author | Alexis PUSKARCZYK | 2016-12-19 10:18:15 +0100 |
|---|---|---|
| committer | Alexis PUSKARCZYK | 2016-12-19 10:18:15 +0100 |
| commit | ea4db4b5e14d27f9820cc72ecc7b244c1c2b9cb9 (patch) | |
| tree | 1c711b85837e96914b692778376f7cf2dc51927f /jni | |
| parent | 127622a0091a7a54c8c32069bdd262ad6d402b16 (diff) | |
| parent | 30373a821c80e223d5c592ccce95377ff57b4998 (diff) | |
| download | pcsx_rearmed-ea4db4b5e14d27f9820cc72ecc7b244c1c2b9cb9.tar.gz pcsx_rearmed-ea4db4b5e14d27f9820cc72ecc7b244c1c2b9cb9.tar.bz2 pcsx_rearmed-ea4db4b5e14d27f9820cc72ecc7b244c1c2b9cb9.zip | |
Merge branch 'master' of https://github.com/libretro/pcsx_rearmed into master_merged
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 36b0c93..9dd9e39 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -2,6 +2,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif + APP_DIR := ../../src #fix stupid change in ndk r11 that breaks compiling even when the exe would run fine @@ -27,7 +32,7 @@ ifeq ($(TARGET_ARCH),arm) 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 + LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/arm/linkage_arm.S ../libpcsxcore/new_dynarec/backends/psx/emu_if.c ../libpcsxcore/new_dynarec/backends/psx/pcsxmem.c # spu LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S @@ -95,7 +100,7 @@ LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.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 -DFRONTEND_SUPPORTS_RGB565 +LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_LDLIBS := -lz -llog |