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 c77dcc47e079393fd95f18a84c558455ccd9ae30..6f479b65e8f822ce5244f4afc848c682e1511dce 100755 (executable)
--- a/darkplaces-dedicated.vcproj
+++ b/darkplaces-dedicated.vcproj
@@ -60,6 +60,7 @@
                                PrecompiledHeaderFile=""\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -234,6 +235,7 @@
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -412,6 +414,7 @@
                                PrecompiledHeaderFile=""\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj
index b5fed6f0db360effcfa7575bb0657f47b239974b..4a39a7a633dd525a0bbdd3b66586ff05a5ad7a4c 100755 (executable)
--- a/darkplaces-sdl.vcproj
+++ b/darkplaces-sdl.vcproj
@@ -60,6 +60,7 @@
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -238,6 +239,7 @@
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -418,6 +420,7 @@
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/darkplaces.vcproj b/darkplaces.vcproj
index a6b65e3aa382f1c8b10787249a63f66d1556aead..9d5523dcdfc76b73b088ea81da07e79e6f9cd84f 100755 (executable)
--- a/darkplaces.vcproj
+++ b/darkplaces.vcproj
@@ -55,11 +55,12 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS"\r
+                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;SUPPORTDIRECTX"\r
                                RuntimeLibrary="2"\r
                                PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\darkplaces.pch"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -228,7 +229,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS"\r
+                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;SUPPORTDIRECTX"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -236,6 +237,7 @@
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -407,11 +409,12 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS"\r
+                               PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;SUPPORTDIRECTX"\r
                                RuntimeLibrary="2"\r
                                PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\darkplaces.pch"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/vid_wgl.c b/vid_wgl.c
index b9b26732e281ce16cfc6290369586af880d47b21..ed890e702baee9a57f2971632de73ea6bb0a1daf 100644 (file)
--- 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>