Changeset 1712 for trunk/src/platform/d3d9/d3d9input.cppTweet

Timestamp:

Aug 10, 2012, 2:15:31 PM (9 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).

File:

• trunk/src/platform/d3d9/d3d9input.cpp (modified) (5 diffs)

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++)
     {