From 74f032bbdd1bd7a950336d5d86b834052fb57ca3 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 14 Sep 2005 22:08:29 +0000
Subject: Fix startup messages displayed (build a console binary; remove CON
 redirection code)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 106
---
 configure.in |  4 ++++
 src/i_main.c | 16 ++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index 5a9d2096..8657de6b 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,10 @@ fi
 
 AM_PATH_SDL(1.1.3)
 
+# Always build a console mode app
+
+SDL_LIBS=`echo $SDL_LIBS | sed 's/mwindows/mconsole/'`
+
 AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[
 dnl    AC_DEFINE(HAVE_LIBSDL_MIXER)
     SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer"
diff --git a/src/i_main.c b/src/i_main.c
index 43f171c9..eab081f4 100644
--- a/src/i_main.c
+++ b/src/i_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_main.c 89 2005-09-07 22:58:34Z fraggle $
+// $Id: i_main.c 106 2005-09-14 22:08:29Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.6  2005/09/14 22:08:28  fraggle
+// Fix startup messages displayed (build a console binary; remove CON
+// redirection code)
+//
 // Revision 1.5  2005/09/07 22:58:34  fraggle
 // No SIGHUP on Windows
 //
@@ -44,7 +48,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: i_main.c 89 2005-09-07 22:58:34Z fraggle $";
+rcsid[] = "$Id: i_main.c 106 2005-09-14 22:08:29Z fraggle $";
 
 
 #include <signal.h>
@@ -80,14 +84,6 @@ int main(int argc, char **argv)
     signal(SIGHUP, SignalHandler);
 #endif
 
-#ifdef _WIN32
-    // restore stdout/stderr
-
-    freopen("CON", "w", stdout);
-    freopen("CON", "w", stderr);
-
-#endif
-    
     // start doom
  
     D_DoomMain (); 
-- 
cgit v1.2.3