Copied the defines I was using from XInput.h directly into HotkeysXinput.cpp, which was breaking the Linux/MacOS builds. Middle click now clears VR options, and XInput INI is saved in binary, which will speed up the polling loop, plus allow for button combos in the future.
Merge remote-tracking branch 'upstream/VR-Hydra' into VR-Hydra
Initial fix for Linux CMake build system
CMake build system now tries to find the SDK, sets -DHAVE_OCULUSSDK properly
Fix whitespace
Added right click option to VR Hotkeys.  Allow combinations of buttons.  GUI still does not show what has been selected, but combination setting/polling code works.
Merge pull request #3 from feilen/VR-Hydra

Fix Linux Build system for 0.4.3
Fix recent additions for GCC build
Fixed a lot of bugs in the VR XInput/DInput code.  Now completely working, except for displaying XInput combinations in the button labels.
VR Hotkeys GUI: Fixed a bug where multiple buttons could be pressed at once.  A lot of code clean up as well.
Merge branch 'VR-Hydra' of https://github.com/feilen/dolphin into VR-Hydra

Conflicts:
	Source/Core/DolphinWX/ConfigVR.h
Implement missing GLX Offscreen rendering functions
Merge branch 'VR-Hydra' of https://github.com/feilen/dolphin into VR-Hydra
Fix for crash when no XInput device is found.
Merge branch 'VR-Hydra' of git://github.com/cegli/dolphin into VR-Hydra
VR Hotkeys GUI: GUI now displays button combinations, combination GUI popup now has two columns.
VR Hotkeys GUI: Save to INI on closing of dialog. Fix bug where gamecube controls were somehow using the ConfigVR inline function.
Merge remote-tracking branch 'upstream/master' into VR-Hydra

Conflicts:
	Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
	Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
	Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
	Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
	Source/Core/DolphinQt/DolphinQt.vcxproj
	Source/Core/DolphinWX/DolphinWX.vcxproj
	Source/Core/DolphinWX/DolphinWX.vcxproj.filters
	Source/Core/VideoBackends/D3D/VertexManager.cpp
	Source/Core/VideoBackends/OGL/FramebufferManager.cpp
	Source/Core/VideoBackends/OGL/Render.cpp
	Source/Core/VideoCommon/VertexShaderManager.cpp
Manually merged all the conflicts between VR-Hydra branch and Master. Also
updated HydraTLayer to work with new Nunchuk code which broke it.  This
code is untested, because I do not have a Hyrda.
Added a define in VR.h to switch between Oculus SDK 0.4.2 and 0.4.3.
0.4.3 causes a significant crawling effect on 2D menus, which hasn't been
debugged yet.