From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 1 Apr 2008 13:09:21 +0000 (+0000)
Subject: disabled QHOST by default (can be enabled with an edit to sys_win.c and
X-Git-Tag: xonotic-v0.1.0preview~2288
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=23584f3da85dd0508907690d60c7ab9ec61d8003

disabled QHOST by default (can be enabled with an edit to sys_win.c and
the re-addition of conproc.c), I don't think anyone ever uses it


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8240 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/makefile.inc b/makefile.inc
index 279fa2e9..53567839 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -260,7 +260,7 @@ OBJ_WINCD=cd_win.o
 #if you want no CD audio
 #OBJ_WINCD=$(OBJ_NOCD)
 
-OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
+OBJ_WGL= builddate.c sys_win.o vid_wgl.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
 
 # Link
 # Note that Windows Vista users may need --large-address-aware because Vista seems to map over 500MB of application address space for its own purposes, which is a significant chunk taken out of the default 2GB address space, this option raises the limit to 4GB (or 3GB on Vista 32 and older versions of Windows).
diff --git a/sys_win.c b/sys_win.c
index 554ffd7d..f12930d0 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -34,10 +34,12 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows
 
 HANDLE				hinput, houtput;
 
+#ifdef QHOST
 static HANDLE	tevent;
 static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
+#endif
 
 
 /*
@@ -94,14 +96,18 @@ void Sys_Error (const char *error, ...)
 
 void Sys_Shutdown (void)
 {
+#ifdef QHOST
 	if (tevent)
 		CloseHandle (tevent);
+#endif
 
 	if (cls.state == ca_dedicated)
 		FreeConsole ();
 
+#ifdef QHOST
 // shut down QHOST hooks if necessary
 	DeinitConProc ();
+#endif
 }
 
 void Sys_PrintToTerminal(const char *text)
@@ -308,6 +314,7 @@ char *Sys_GetClipboardData (void)
 
 void Sys_InitConsole (void)
 {
+#ifdef QHOST
 	int t;
 
 	// initialize the windows dedicated server console if needed
@@ -315,6 +322,7 @@ void Sys_InitConsole (void)
 
 	if (!tevent)
 		Sys_Error ("Couldn't create event");
+#endif
 
 	houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 	hinput = GetStdHandle (STD_INPUT_HANDLE);
@@ -334,6 +342,7 @@ void Sys_InitConsole (void)
 			Sys_Error ("Couldn't create dedicated server console");
 
 
+#ifdef QHOST
 #ifdef _WIN64
 #define atoi _atoi64
 #endif
@@ -357,6 +366,7 @@ void Sys_InitConsole (void)
 		}
 
 		InitConProc (hFile, heventParent, heventChild);
+#endif
 	}
 
 // because sound is off until we become active