fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplifying macros to fix VS' broken preprocessor.

Browse Source
This commit is contained in:
Ben Vanik
2014-01-12 14:06:00 -08:00
parent 123444078f
commit 6129e1eb7a
26 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/hid/hid.cc
View File

@@ -21,7 +21,7 @@ DEFINE_string(hid, "any",
#include <xenia/hid/nop/nop_hid.h>
#if XE_PLATFORM(WIN32)
#if XE_PLATFORM_WIN32
#include <xenia/hid/xinput/xinput_hid.h>
#endif // WIN32
@@ -32,7 +32,7 @@ InputSystem* xe::hid::Create(Emulator* emulator) {
if (FLAGS_hid.compare("nop") == 0) {
input_system->AddDriver(xe::hid::nop::Create(input_system));
#if XE_PLATFORM(WIN32)
#if XE_PLATFORM_WIN32
} else if (FLAGS_hid.compare("xinput") == 0) {
input_system->AddDriver(xe::hid::xinput::Create(input_system));
#endif // WIN32
@@ -42,7 +42,7 @@ InputSystem* xe::hid::Create(Emulator* emulator) {
// NOTE: in any mode we create as many as we can, falling back to nop.
#if XE_PLATFORM(WIN32)
#if XE_PLATFORM_WIN32
InputDriver* xinput_driver = xe::hid::xinput::Create(input_system);
if (xinput_driver) {
input_system->AddDriver(xinput_driver);