Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-12 06:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Tweaks for arch builds

Browse Source
This commit is contained in:
Aaron Culliney 2016-04-21 22:06:42 -07:00
parent b2acb4a1ed
commit a5a498f96c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/jni/Application.mk
View File

@ -1,4 +1,4 @@
APP_ABI := armeabi armeabi-v7a x86 APP_ABI := armeabi armeabi-v7a x86 x86_64
# Do not change APP_PLATFORM if we care about Gingerbread (2.3.3) devices! We must compile against android-10, # Do not change APP_PLATFORM if we care about Gingerbread (2.3.3) devices! We must compile against android-10,
# otherwise we may encounter runtime load-library errors from symbols that should have been inlined against older # otherwise we may encounter runtime load-library errors from symbols that should have been inlined against older

2
Android/jni/apple2ix.mk
View File

@ -28,7 +28,7 @@ LOCAL_SRC_FILES := jnicrash.c $(APPLE2_SRC_PATH)/breakpad.C
LOCAL_CFLAGS := $(APPLE2_BASE_CFLAGS) $(BREAKPAD_CFLAGS) LOCAL_CFLAGS := $(APPLE2_BASE_CFLAGS) $(BREAKPAD_CFLAGS)
LOCAL_LDLIBS := $(APPLE2_BASE_LDLIBS) LOCAL_LDLIBS := $(APPLE2_BASE_LDLIBS)
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64))
LOCAL_SRC_FILES += $(APPLE2_X86_SRC) LOCAL_SRC_FILES += $(APPLE2_X86_SRC)
LOCAL_CFLAGS += -DNO_UNDERSCORES=1 LOCAL_CFLAGS += -DNO_UNDERSCORES=1
else else

2
Android/jni/build.sh
View File

@ -141,7 +141,7 @@ if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
# Symbolicate and move symbols file into location to be deployed on device # Symbolicate and move symbols file into location to be deployed on device
SYMFILE=libapple2ix.so.sym SYMFILE=libapple2ix.so.sym
ARCHES_TO_SYMBOLICATE='armeabi armeabi-v7a x86' ARCHES_TO_SYMBOLICATE='armeabi armeabi-v7a x86 x86_64'
for arch in $ARCHES_TO_SYMBOLICATE ; do for arch in $ARCHES_TO_SYMBOLICATE ; do
SYMDIR=../assets/symbols/$arch/libapple2ix.so SYMDIR=../assets/symbols/$arch/libapple2ix.so

2
Android/jni/sources.mk
View File

@ -40,7 +40,7 @@ APPLE2_MAIN_SRC = \
jnihooks.c androidkeys.c jnihooks.c androidkeys.c
APPLE2_OPTIM_CFLAGS := -O2 APPLE2_OPTIM_CFLAGS := -O2
APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -DPREVENT_TEXTREL=1 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH) APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic
LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures

4
src/arm/cpu-regs.h
View File

@ -64,7 +64,7 @@
#error __COUNTER__ macro should be available in modern compilers #error __COUNTER__ macro should be available in modern compilers
#endif #endif
#if PREVENT_TEXTREL #if __PIC__
# define _SYM_ADDR_PRE(reg) \ # define _SYM_ADDR_PRE(reg) \
ldr reg, 5f; ldr reg, 5f;
@ -89,7 +89,7 @@
_SYM_ADDR_OFF_ARM(reg, __COUNTER__); \ _SYM_ADDR_OFF_ARM(reg, __COUNTER__); \
_SYM_ADDR_POST(var,8) _SYM_ADDR_POST(var,8)
# endif # endif
#else /* !PREVENT_TEXTREL */ #else /* !__PIC__ */
# if NO_UNDERSCORES # if NO_UNDERSCORES
# define SYM(reg,var) \ # define SYM(reg,var) \
ldr reg, =var ldr reg, =var