From 51fcf8f7ac732bad580f67dfc64f03dd046c4f74 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Tue, 17 Nov 2020 22:46:24 +0200
Subject: [PATCH] Attempt to fix example_gamepad for windows msys2 workflow
---
.github/workflows/windows.yml | 2 +-
example_gamepad/src/InputHandler.h | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 14ffe62..c142046 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ jobs:
- uses: msys2/setup-msys2@v2
with:
update: true
- install: unzip mingw-w64-x86_64-SDL2
+ install: unzip mingw64/mingw-w64-x86_64-SDL2
msystem: MINGW64
- uses: actions/checkout@v2
with:
diff --git a/example_gamepad/src/InputHandler.h b/example_gamepad/src/InputHandler.h
index 949a64d..053a103 100644
--- a/example_gamepad/src/InputHandler.h
+++ b/example_gamepad/src/InputHandler.h
@@ -7,7 +7,7 @@
#include <string>
#include <sstream>
#include <iostream>
-#include "SDL2/SDL.h"
+#include <SDL2/SDL.h>
#include "ofMain.h"
#include "ofxXmlSettings.h"
@@ -40,17 +40,17 @@ struct ControllerItem{
class InputHandler{
public:
static InputHandler * instance();
-
+
void initialise();
void update();
void clean();
-
+
bool initialised();
-
+
ControllerItem getControllerItem(std::string code);
ControllerCommand getControllerCommand(int controllerIndex, ControllerItem & item);
std::string controllerCommandToString(ControllerCommand com);
-
+
private:
InputHandler(){}
~InputHandler(){}