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

makefile: Make compile time Android Version visible in SHOW VERSION output

Browse source
This commit is contained in:
Mark Pizzolato 2018-05-10 21:55:15 -07:00
parent c1894a7ddb
commit cb53ddbc12
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
makefile
View file

@ -288,7 +288,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
else else
ifeq (Linux,$(OSTYPE)) ifeq (Linux,$(OSTYPE))
ifeq (Android,$(shell uname -o)) ifeq (Android,$(shell uname -o))
OS_CCDEFS += -D__ANDROID_API__=$(shell getprop ro.build.version.sdk) OS_CCDEFS += -D__ANDROID_API__=$(shell getprop ro.build.version.sdk) -DSIM_BUILD_OS=" On Android Version $(shell getprop ro.build.version.release)"
endif endif
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD))) ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
ifeq (Android,$(shell uname -o)) ifeq (Android,$(shell uname -o))

9
scp.c
View file

@ -5321,7 +5321,14 @@ if (flag) {
#else #else
cpp = "C"; cpp = "C";
#endif #endif
fprintf (st, "\n Simulator Compiled as %s%s%s on %s at %s", cpp, arch, build, __DATE__, __TIME__); #if !defined (SIM_BUILD_OS)
#define SIM_BUILD_OS
#endif
#define S_xstr(a) S_str(a)
#define S_str(a) #a
fprintf (st, "\n Simulator Compiled as %s%s%s on %s at %s%s", cpp, arch, build, __DATE__, __TIME__, S_xstr(SIM_BUILD_OS));
#undef S_str
#undef S_xstr
#endif #endif
fprintf (st, "\n Memory Access: %s Endian", sim_end ? "Little" : "Big"); fprintf (st, "\n Memory Access: %s Endian", sim_end ? "Little" : "Big");
fprintf (st, "\n Memory Pointer Size: %d bits", (int)sizeof(dptr)*8); fprintf (st, "\n Memory Pointer Size: %d bits", (int)sizeof(dptr)*8);