X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=ce9762ad1c4feaa31fad72e7254ee27d4525196c;hb=4c3b98565410c5017afea8f41b7a56322a7a66db;hp=50aa696902ff26b6b6b36ec8fc18a86c9b55eac4;hpb=ebed7428a3e7e817bb4befe7fdfc1f5681577e50;p=pcsx_rearmed.git diff --git a/jni/Android.mk b/jni/Android.mk index 50aa6969..ce9762ad 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -$(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_)) +$(shell cd "$(LOCAL_PATH)" && ((git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_)) $(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h)) $(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_)) @@ -141,7 +141,9 @@ endif ifeq ($(HAVE_LIGHTREC),1) COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \ - $(DEPS_DIR)/lightrec + $(DEPS_DIR)/lightrec \ + $(ROOT_DIR)/include/lightning \ + $(ROOT_DIR)/include/lightrec SOURCES_C += $(DEPS_DIR)/lightrec/blockcache.c \ $(DEPS_DIR)/lightrec/disassembler.c \ $(DEPS_DIR)/lightrec/emitter.c \