android: make armeabi buildable

This commit is contained in:
notaz 2017-10-13 23:38:09 +03:00
parent df9251536d
commit b5f5dc1fad
4 changed files with 15 additions and 2 deletions

View file

@ -8,7 +8,9 @@
**/
#ifndef HAVE_ARMv6
#define HAVE_ARMv6 1
#endif
#define USE_MS_SYNTAX 0
#define CYCLONE_FOR_GENESIS 2
#define COMPRESS_JUMPTABLE 0

View file

@ -0,0 +1,2 @@
#define HAVE_ARMv6 0
#include "cyclone_config.h"

View file

@ -49,6 +49,13 @@ ifeq ($(TARGET_ARCH),arm)
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

View file

@ -173,13 +173,15 @@ ifeq "$(use_cyclone)" "1"
$(FR)pico/pico.c: $(FR)cpu/cyclone/Cyclone.h
endif
CYCLONE_CONFIG ?= cyclone_config.h
$(FR)cpu/cyclone/Cyclone.h:
@echo "Cyclone submodule is missing, please run 'git submodule update --init'"
@false
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone_config.h
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
@echo building Cyclone...
@make -C $(R)cpu/cyclone/ CONFIG_FILE=../cyclone_config.h
@make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG)
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h