From 74ed786d7546b22ec31fbd441a7a03b7b06836a4 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 25 Mar 2014 16:55:56 +0200 Subject: Add optional Win32 console allocation This patch adds the optional --win32console command line option. It does nothing on OSx and Linux, while is only useable on Win32. On Win32 if the application was built as GUI (not console), there is no way to view stdout and stderr. With windows.c's subsurface_console_init() we are able to either redirect stdout and stderr to the terminal from which subsurface.exe was started (always happens; --win32console does nothing in this case) or if --win32console is explicitly added to a shortcut, create a dedicated console window and monitor the output there. if set, WIN32_CONSOLE_APP is a condition that will make the subsurface_console_init() and subsurface_console_exit() functions NOP on Windows. The definition will be created if the user passes 'CONFIG += console' to qmake. Fixes #436 Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- subsurfacestartup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'subsurfacestartup.c') diff --git a/subsurfacestartup.c b/subsurfacestartup.c index 6d3714b91..b16c1fb9c 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -94,7 +94,8 @@ static void print_help() printf("\n --help|-h This help text"); printf("\n --import logfile ... Logs before this option is treated as base, everything after is imported"); printf("\n --verbose|-v Verbose debug (repeat to increase verbosity)"); - printf("\n --version Prints current version\n\n"); + printf("\n --version Prints current version"); + printf("\n --win32console Create a dedicated console if needed (Windows only). Add option before everything else\n\n"); } void parse_argument(const char *arg) @@ -130,6 +131,8 @@ void parse_argument(const char *arg) print_version(); exit(0); } + if (strcmp(arg, "--win32console") == 0) + return; /* fallthrough */ case 'p': /* ignore process serial number argument when run as native macosx app */ -- cgit v1.2.3-70-g09d2