Changeset 1712Tweet

Timestamp:

Aug 10, 2012, 2:15:31 PM (11 years ago)

Author:

sam

Message:

build: split the D3d9 build flags into D3d9 and Xinput for situations where
we want Xinput but not D3D (ie. OpenGL).

Location:

trunk

Files:

• build/vs2010/Lol.Core.Rules.props (modified) (3 diffs)
• build/vs2010/Lol.Core.Vars.props (modified) (2 diffs)
• src/platform/d3d9/d3d9input.cpp (modified) (5 diffs)
• src/platform/sdl/sdlapp.cpp (modified) (2 diffs)
• src/platform/sdl/sdlinput.cpp (modified) (1 diff)

trunk/build/vs2010/Lol.Core.Rules.props

@@ -11 +11 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\src\bullet;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -44 +44 @@
     <Link>
       <!-- FIXME: not for the static library! -->
-      <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(XinputDeps);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
@@ -51 +51 @@
       <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(XinputLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>

trunk/build/vs2010/Lol.Core.Vars.props

@@ -62 +62 @@
     <D3d9Libs Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)\Lib\x86</D3d9Libs>
     <D3d9Libs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</D3d9Libs>
-    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
-    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
+    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib</D3d9Deps>
+    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib</D3d9Deps>
     <Win32Defines Condition="'$(UseOpenGL)'=='false'">USE_D3D9;$(Win32Defines)</Win32Defines>
+
+    <!-- Xinput -->
+    <XinputIncludes>$(DXSDK_DIR)\Include</XinputIncludes>
+    <XinputLibs Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)\Lib\x86</XinputLibs>
+    <XinputLibs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</XinputLibs>
+    <XinputDeps>xinput.lib</XinputDeps>
+    <Win32Defines>USE_XINPUT;$(Win32Defines)</Win32Defines>
 
     <!-- PS3-specific -->
@@ -105 +112 @@
     <BuildMacro Include="D3d9Libs"><Value>$(D3d9Libs)</Value></BuildMacro>
     <BuildMacro Include="D3d9Deps"><Value>$(D3d9Deps)</Value></BuildMacro>
+    <BuildMacro Include="XinputIncludes"><Value>$(XinputIncludes)</Value></BuildMacro>
+    <BuildMacro Include="XinputLibs"><Value>$(XinputLibs)</Value></BuildMacro>
+    <BuildMacro Include="XinputDeps"><Value>$(XinputDeps)</Value></BuildMacro>
     <BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro>
     <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>

trunk/src/platform/d3d9/d3d9input.cpp

@@ -13 +13 @@
 #endif
 
-#if defined USE_D3D9
+#if defined USE_XINPUT
 #   include <d3d9.h>
 #   include <xinput.h>
@@ -33 +33 @@
 
 private:
-#if defined USE_D3D9
+#if defined USE_XINPUT
     Array<int, Stick *> m_joysticks;
 #endif
@@ -45 +45 @@
   : m_data(new D3d9InputData())
 {
-#if defined USE_D3D9
+#if defined USE_XINPUT
     for (int i = 0; i < XUSER_MAX_COUNT; i++)
     {
@@ -64 +64 @@
 D3d9Input::~D3d9Input()
 {
-#if defined USE_D3D9
+#if defined USE_XINPUT
     /* Unregister all the joysticks we added */
     while (m_data->m_joysticks.Count())
@@ -84 +84 @@
     Entity::TickDraw(seconds);
 
-#if defined USE_D3D9
+#if defined USE_XINPUT
     for (int i = 0; i < m_data->m_joysticks.Count(); i++)
     {

trunk/src/platform/sdl/sdlapp.cpp

@@ -29 +29 @@
 #include "platform/sdl/sdlapp.h"
 #include "platform/sdl/sdlinput.h"
-#if defined USE_D3D9
+#if defined USE_XINPUT
 #   include "platform/d3d9/d3d9input.h"
 #endif
@@ -94 +94 @@
 
     /* Autoreleased objects */
-#   if defined USE_D3D9
+#   if defined USE_XINPUT
     /* Prefer D3d9 for joysticks on Windows, because the X360 pads are not
      * advertised with the proper number of axes. */

trunk/src/platform/sdl/sdlinput.cpp

@@ -70 +70 @@
         SDL_Joystick *sdlstick = SDL_JoystickOpen(i);
 
-        /* Blacklist HDAPS, it's not a real joystick */
+        /* Blacklist some devices:
+         *  - HDAPS, it's not a real joystick.
+         *  - X360 controllers, Xinput handles them better since
+         *    it won't think there is only one trigger axis. */
         char const *name = SDL_JoystickName(i);
         if (strstr(name, "HDAPS")
-#   if !defined USE_D3D9
+#   if defined USE_XINPUT
              || strstr(name, "XBOX 360 For Windows")
 #   endif