Browse Source

Attempt to fix example_gamepad for windows msys2 workflow

master
Krisjanis Rijnieks 5 years ago
parent
commit
51fcf8f7ac
  1. 2
      .github/workflows/windows.yml
  2. 10
      example_gamepad/src/InputHandler.h

2
.github/workflows/windows.yml

@ -15,7 +15,7 @@ jobs:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
update: true update: true
install: unzip mingw-w64-x86_64-SDL2 install: unzip mingw64/mingw-w64-x86_64-SDL2
msystem: MINGW64 msystem: MINGW64
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

10
example_gamepad/src/InputHandler.h

@ -7,7 +7,7 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include "SDL2/SDL.h" #include <SDL2/SDL.h>
#include "ofMain.h" #include "ofMain.h"
#include "ofxXmlSettings.h" #include "ofxXmlSettings.h"
@ -40,17 +40,17 @@ struct ControllerItem{
class InputHandler{ class InputHandler{
public: public:
static InputHandler * instance(); static InputHandler * instance();
void initialise(); void initialise();
void update(); void update();
void clean(); void clean();
bool initialised(); bool initialised();
ControllerItem getControllerItem(std::string code); ControllerItem getControllerItem(std::string code);
ControllerCommand getControllerCommand(int controllerIndex, ControllerItem & item); ControllerCommand getControllerCommand(int controllerIndex, ControllerItem & item);
std::string controllerCommandToString(ControllerCommand com); std::string controllerCommandToString(ControllerCommand com);
private: private:
InputHandler(){} InputHandler(){}
~InputHandler(){} ~InputHandler(){}

Loading…
Cancel
Save