From: echon <echon@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 6 Sep 2009 17:04:31 +0000 (+0000)
Subject: Compile as C code, not C++ (vcproj setting)
X-Git-Tag: xonotic-v0.1.0preview~1465
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b85979b17195cd31b35737b4bc0e5947d7c2711;p=xonotic%2Fdarkplaces.git

Compile as C code, not C++ (vcproj setting)
Include dinput8 libs if SUPPORTDIRECTX is defined
Default to defining SUPPORTDIRECTX on windows builds, otherwise you get crackly sound

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

diff --git a/darkplaces-dedicated.vcproj b/darkplaces-dedicated.vcproj
index c77dcc47..6f479b65 100755
--- a/darkplaces-dedicated.vcproj
+++ b/darkplaces-dedicated.vcproj
@@ -60,6 +60,7 @@
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -234,6 +235,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -412,6 +414,7 @@
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj
index b5fed6f0..4a39a7a6 100755
--- a/darkplaces-sdl.vcproj
+++ b/darkplaces-sdl.vcproj
@@ -60,6 +60,7 @@
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -238,6 +239,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -418,6 +420,7 @@
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/darkplaces.vcproj b/darkplaces.vcproj
index a6b65e3a..9d5523dc 100755
--- a/darkplaces.vcproj
+++ b/darkplaces.vcproj
@@ -55,11 +55,12 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;SUPPORTDIRECTX"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\darkplaces.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -228,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;SUPPORTDIRECTX"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -236,6 +237,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -407,11 +409,12 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;SUPPORTDIRECTX"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\darkplaces.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/vid_wgl.c b/vid_wgl.c
index b9b26732..ed890e70 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -17,10 +17,16 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// gl_vidnt.c -- NT GL vid component
+// vid_wgl.c -- NT GL vid component
 
-// we don't need a very new dinput
-#define DIRECTINPUT_VERSION 0x0300
+#ifdef SUPPORTDIRECTX
+// Include DX libs
+#pragma comment(lib, "dinput8.lib")
+#pragma comment(lib, "dxguid.lib")
+#ifndef DIRECTINPUT_VERSION
+#	define DIRECTINPUT_VERSION 0x0500  /* Version 5.0 */
+#endif
+#endif
 
 #include "quakedef.h"
 #include <windows.h>