From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Wed, 14 Jul 2010 10:11:20 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~183
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b111315e56df8dd364937302531bbbb5bf82ee63;p=xonotic%2Fdarkplaces.git

UNMERGE
fix a warning in mingw

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10318 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=d34c63e7b39ac9ba7cb181cc09cab84508586df7
---

diff --git a/vid_wgl.c b/vid_wgl.c
index 53153e02..8ea9f586 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -19,16 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // vid_wgl.c -- NT GL vid component
 
-#ifdef _MSC_VER
 #pragma comment(lib, "comctl32.lib")
-#endif
 
 #ifdef SUPPORTDIRECTX
 // Include DX libs
-#ifdef _MSC_VER
 #pragma comment(lib, "dinput8.lib")
 #pragma comment(lib, "dxguid.lib")
-#endif
 #ifndef DIRECTINPUT_VERSION
 #	define DIRECTINPUT_VERSION 0x0500  /* Version 5.0 */
 #endif
@@ -48,9 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef SUPPORTD3D
 #include <d3d9.h>
-#ifdef _MSC_VER
 #pragma comment(lib, "d3d9.lib")
-#endif
 
 cvar_t vid_dx9 = {CVAR_SAVE, "vid_dx9", "0", "use Microsoft Direct3D9(r) for rendering"};
 cvar_t vid_dx9_hal = {CVAR_SAVE, "vid_dx9_hal", "1", "enables hardware rendering (1), otherwise software reference rasterizer (0 - very slow), note that 0 is necessary when using NVPerfHUD (which renders in hardware but requires this option to enable it)"};