Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
OIS
Commits
b4398080
Commit
b4398080
authored
Dec 13, 2011
by
Phillip Castaneda
Browse files
Fixing latest gcc/mingw compile errors
parent
1607ee66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
includes/win32/Win32JoyStick.h
includes/win32/Win32JoyStick.h
+2
-0
includes/win32/Win32Prereqs.h
includes/win32/Win32Prereqs.h
+1
-0
src/win32/Win32JoyStick.cpp
src/win32/Win32JoyStick.cpp
+6
-2
No files found.
includes/win32/Win32JoyStick.h
View file @
b4398080
...
...
@@ -49,6 +49,7 @@ namespace OIS
/** @copydoc Object::_initialize */
virtual
void
_initialize
();
#ifdef OIS_WIN32_XINPUT_SUPPORT
/**
@remarks
Enum each PNP device using WMI and check each device ID to see if it contains
...
...
@@ -56,6 +57,7 @@ namespace OIS
Unfortunately this information can not be found by just using DirectInput
*/
static
void
CheckXInputDevices
(
JoyStickInfoList
&
joys
);
#endif
protected:
//! Enumerates all things
...
...
includes/win32/Win32Prereqs.h
View file @
b4398080
...
...
@@ -23,6 +23,7 @@ restrictions:
#ifndef _WIN32_INPUTSYSTEM_PREREQS_H
#define _WIN32_INPUTSYSTEM_PREREQS_H
#include <cstddef>
#define WIN32_LEAN_AND_MEAN
#define DIRECTINPUT_VERSION 0x0800
#include <windows.h>
...
...
src/win32/Win32JoyStick.cpp
View file @
b4398080
...
...
@@ -27,6 +27,9 @@ restrictions:
#include "OISException.h"
#include <cassert>
// Only if xinput support is enabled
#ifdef OIS_WIN32_XINPUT_SUPPORT
#include <wbemidl.h>
#include <oleauto.h>
//#include <wmsstd.h>
...
...
@@ -39,8 +42,7 @@ restrictions:
}
#endif
#ifdef OIS_WIN32_XINPUT_SUPPORT
# pragma comment(lib, "xinput.lib")
#pragma comment(lib, "xinput.lib")
#endif
//DX Only defines macros for the JOYSTICK not JOYSTICK2, so fix it
...
...
@@ -559,6 +561,7 @@ Interface* Win32JoyStick::queryInterface(Interface::IType type)
}
//--------------------------------------------------------------------------------------------------//
#ifdef OIS_WIN32_XINPUT_SUPPORT
void
Win32JoyStick
::
CheckXInputDevices
(
JoyStickInfoList
&
joys
)
{
IWbemLocator
*
pIWbemLocator
=
NULL
;
...
...
@@ -682,3 +685,4 @@ LCleanup:
if
(
bCleanupCOM
)
CoUninitialize
();
}
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment