X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=6175b4f5e31f8bdc7d893fc343339c74664a0fdc;hb=2000fe0dea529231a494c63436f171829cbf43e5;hp=d0efa8353c0c62a05fd7653370374f17ceaa17ac;hpb=913039faa5b22651954fe10a148ff1e87e4b84fd;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index d0efa835..6175b4f5 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,6 +1,9 @@
-#include "quakedef.h"
 
 #ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#endif
 #include <io.h>
 #include "conio.h"
 #else
@@ -13,6 +16,8 @@
 
 #include <SDL.h>
 
+#include "quakedef.h"
+
 // =======================================================================
 // General routines
 // =======================================================================
@@ -47,24 +52,31 @@ void Sys_Error (const char *error, ...)
 	exit (1);
 }
 
+static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
-#ifndef WIN32
+	if(outfd < 0)
+		return;
+#ifdef FNDELAY
 	// 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);
-#else
+	// 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, 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);
 }
@@ -168,6 +180,16 @@ int main (int argc, char *argv[])
 
 	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);