From 4239e321d9d5003858af4efde584d113b281a47d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 18 Oct 2009 23:36:10 +0000
Subject: * Merge ioq3-r1680

---
 src/sys/sys_main.c  | 12 +++---------
 src/sys/sys_win32.c |  3 +++
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/sys')

diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index 0a4183c7..f1b0c38a 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -381,9 +381,8 @@ static void* Sys_TryLibraryLoad(const char* base, const char* gamedir, const cha
 Sys_LoadDll
 
 Used to load a development dll instead of a virtual machine
-#1 look down current path
-#2 look in fs_homepath
-#3 look in fs_basepath
+#1 look in fs_homepath
+#2 look in fs_basepath
 =================
 */
 void *Sys_LoadDll( const char *name, char *fqpath ,
@@ -395,7 +394,6 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
 	char  fname[MAX_OSPATH];
 	char  *basepath;
 	char  *homepath;
-	char  *pwdpath;
 	char  *gamedir;
 
 	assert( name );
@@ -403,15 +401,11 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
 	Q_snprintf (fname, sizeof(fname), "%s" ARCH_STRING DLL_EXT, name);
 
 	// TODO: use fs_searchpaths from files.c
-	pwdpath = Sys_Cwd();
 	basepath = Cvar_VariableString( "fs_basepath" );
 	homepath = Cvar_VariableString( "fs_homepath" );
 	gamedir = Cvar_VariableString( "fs_game" );
 
-	libHandle = Sys_TryLibraryLoad(pwdpath, gamedir, fname, fqpath);
-
-	if(!libHandle && homepath)
-		libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
+	libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
 
 	if(!libHandle && basepath)
 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
diff --git a/src/sys/sys_win32.c b/src/sys/sys_win32.c
index 18efe406..bf4b8f75 100644
--- a/src/sys/sys_win32.c
+++ b/src/sys/sys_win32.c
@@ -650,5 +650,8 @@ void Sys_PlatformInit( void )
 	}
 	else
 		SDL_VIDEODRIVER_externallySet = qfalse;
+
+	// Don't redirect to stdout.txt and stderr.txt
+	_putenv( "SDL_STDIO_REDIRECT=0" );
 #endif
 }
-- 
cgit