all repos — mgba @ 10da73fcaf282b99736056a6bffb99c2f12778ba

mGBA Game Boy Advance Emulator

Fix the MSVC and SDL-less builds.
waddlesplash waddlesplash@gmail.com
Mon, 27 Mar 2017 11:38:10 -0400
commit

10da73fcaf282b99736056a6bffb99c2f12778ba

parent

e38e3f30619cab772fcaa9f3530f052da10b29e7

M src/platform/qt/InputController.cppsrc/platform/qt/InputController.cpp

@@ -730,9 +730,9 @@ mPlatform platform = m_inputMenuIndices.key(index.parent(), PLATFORM_NONE);

bindHat(platform, SDL_BINDING_BUTTON, hat, direction, coreKey); } #else -void InputController::bindButton(const QModelIndex& index, int key, int) {} -void InputController::bindAxis(const QModelIndex& index, int axis, GamepadAxisEvent::Direction, int) {} -void InputController::bindHat(const QModelIndex& index, int hat, GamepadHatEvent::Direction, int) {} +void InputController::bindButton(const QModelIndex& index, int key) {} +void InputController::bindAxis(const QModelIndex& index, int axis, GamepadAxisEvent::Direction) {} +void InputController::bindHat(const QModelIndex& index, int hat, GamepadHatEvent::Direction) {} #endif bool InputController::eventFilter(QObject*, QEvent* event) {
M src/platform/qt/InputController.hsrc/platform/qt/InputController.h

@@ -9,6 +9,8 @@

#include "GamepadAxisEvent.h" #include "GamepadHatEvent.h" +#include <memory> + #include <QMap> #include <QObject> #include <QSet>
M src/platform/qt/InputItem.hsrc/platform/qt/InputItem.h

@@ -9,6 +9,8 @@

#include "GamepadAxisEvent.h" #include "GamepadHatEvent.h" +#include <functional> + #include <QAction> #include <mgba/core/core.h>