diff --git a/makefile b/makefile index e6b96b78..63587b87 100644 --- a/makefile +++ b/makefile @@ -288,7 +288,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) else ifeq (Linux,$(OSTYPE)) 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 ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD))) ifeq (Android,$(shell uname -o)) diff --git a/scp.c b/scp.c index 5e5c7a3f..0526fe70 100644 --- a/scp.c +++ b/scp.c @@ -5321,7 +5321,14 @@ if (flag) { #else cpp = "C"; #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 fprintf (st, "\n Memory Access: %s Endian", sim_end ? "Little" : "Big"); fprintf (st, "\n Memory Pointer Size: %d bits", (int)sizeof(dptr)*8);