Fix recent additions for GCC build
Merge branch 'VR-Hydra' of https://github.com/feilen/dolphin into VR-Hydra

Conflicts:
	Source/Core/DolphinWX/ConfigVR.h