folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: Support mode Android versions when termux is used

Browse source
This commit is contained in:
Mark Pizzolato 2018-05-09 10:39:10 -07:00
parent 914d79c980
commit 39802c465a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
makefile
View file

@ -287,11 +287,11 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
endif endif
else else
ifeq (Linux,$(OSTYPE)) ifeq (Linux,$(OSTYPE))
ifeq (Android,$(shell uname -o))
OS_CCDEFS += -D__ANDROID_API__=$(shell getprop ro.build.version.sdk)
endif
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD))) ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
ifneq (,$(shell if $(TEST) -d /system/lib; then echo systemlib; fi)) ifneq (,$(shell if $(TEST) -d /system/lib; then echo systemlib; fi))
ifneq (,$(shell uname -a | grep 'aarch64 Android'))
OS_CCDEFS += -DCANT_USE_TERMIOS_TCSAFLUSH
endif
LIBPATH += /system/lib LIBPATH += /system/lib
endif endif
ifneq (,$(shell if $(TEST) -d /data/data/com.termux/files/usr/lib; then echo termuxlib; fi)) ifneq (,$(shell if $(TEST) -d /data/data/com.termux/files/usr/lib; then echo termuxlib; fi))

2
sim_console.c
View file

@ -3928,7 +3928,7 @@ return SCPE_OK;
#else #else
#if !defined(CANT_USE_TERMIOS_TCSAFLUSH) #if !defined (__ANDROID_API__) || (__ANDROID_API__ < 26)
#define TCSETATTR_ACTION TCSAFLUSH #define TCSETATTR_ACTION TCSAFLUSH
#else #else
#define TCSETATTR_ACTION TCSANOW #define TCSETATTR_ACTION TCSANOW

2
sim_fio.c
View file

@ -324,7 +324,7 @@ return (t_offset)fileaddr;
/* Linux */ /* Linux */
#if defined (__linux) || defined (__linux__) || defined (__hpux) || defined (_AIX) #if ((defined (__linux) || defined (__linux__)) && (!defined (__ANDROID_API__) || (__ANDROID_API__ >= 24))) || defined (__hpux) || defined (_AIX)
#define S_SIM_IO_FSEEK_EXT_ 1 #define S_SIM_IO_FSEEK_EXT_ 1
int sim_fseeko (FILE *st, t_offset xpos, int origin) int sim_fseeko (FILE *st, t_offset xpos, int origin)
{ {