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 #85 from orbea/git
[picodrive.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
a0f5dc8
..
9252d9f
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-2,7
+2,7
@@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
-GIT_VERSION
:
= " $(shell git rev-parse --short HEAD || echo unknown)"
+GIT_VERSION
?
= " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
ifneq ($(GIT_VERSION)," unknown")
LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
@@
-49,6
+49,13
@@
ifeq ($(TARGET_ARCH),arm)
asm_misc = 1
# asm_cdmemory = 1 # texrels
asm_mix = 1
asm_misc = 1
# asm_cdmemory = 1 # texrels
asm_mix = 1
+
+# for armeabi to build...
+CYCLONE_CONFIG = cyclone_config_armv4.h
+
+$(cleantarget)::
+ $(MAKE) -C $(FR)cpu/cyclone/ clean
+
else
use_fame = 1
use_cz80 = 1
else
use_fame = 1
use_cz80 = 1