#include <sys/time.h>
#endif
+#ifdef __ANDROID__
+#include <android/log.h>
+
+#ifndef FNDELAY
+#define FNDELAY O_NDELAY
+#endif
+#endif
+
#include <signal.h>
#include <SDL.h>
void Sys_Shutdown (void)
{
+#ifdef __ANDROID__
+ Sys_AllowProfiling(false);
+#endif
#ifndef WIN32
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
exit (1);
}
+static int outfd = 1;
void Sys_PrintToTerminal(const char *text)
{
-#ifndef WIN32
- // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
- int origflags = fcntl (1, F_GETFL, 0);
- fcntl (1, F_SETFL, origflags & ~FNDELAY);
+#ifdef __ANDROID__
+ if (developer.integer > 0)
+ {
+ __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
+ }
#else
+ if(outfd < 0)
+ return;
+#ifdef FNDELAY
+ // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
+ // this is because both go to /dev/tty by default!
+ {
+ int origflags = fcntl (outfd, F_GETFL, 0);
+ fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+#endif
+#ifdef WIN32
#define write _write
#endif
- while(*text)
- {
- int written = (int)write(1, text, (int)strlen(text));
- if(written <= 0)
- break; // sorry, I cannot do anything about this error - without an output
- text += written;
+ while(*text)
+ {
+ fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(text));
+ if(written <= 0)
+ break; // sorry, I cannot do anything about this error - without an output
+ text += written;
+ }
+#ifdef FNDELAY
+ fcntl (outfd, F_SETFL, origflags);
}
-#ifndef WIN32
- fcntl (1, F_SETFL, origflags);
#endif
//fprintf(stdout, "%s", text);
+#endif
}
char *Sys_ConsoleInput(void)
{
- if (cls.state == ca_dedicated)
+// if (cls.state == ca_dedicated)
{
static char text[MAX_INPUTLINE];
int len = 0;
{
signal(SIGFPE, SIG_IGN);
+#ifdef __ANDROID__
+ Sys_AllowProfiling(true);
+#endif
+
com_argc = argc;
com_argv = (const char **)argv;
Sys_ProvideSelfFD();
+ // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+ if(COM_CheckParm("-noterminal"))
+ outfd = -1;
+ // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+ else if(COM_CheckParm("-stderr"))
+ outfd = 2;
+ else
+ outfd = 1;
+
#ifndef WIN32
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif