Merge branch 'master' of ../../fceux

2020-08-14 21:22:07 -04:00 · 2020-08-14 21:22:07 -04:00 · e9dd3b162e
parent abadbc8d06 d2a00887a0
commit e9dd3b162e
2 changed files with 5 additions and 5 deletions
--- a/src/drivers/sdl/sdl-joystick.cpp
+++ b/src/drivers/sdl/sdl-joystick.cpp
@ -23,8 +23,8 @@
 /// \brief Handles joystick input using the SDL.

 //#include <QDir>
-#include "Qt/sdl.h"
-#include "Qt/sdl-joystick.h"
+#include "sdl/sdl.h"
+#include "sdl/sdl-joystick.h"

 #include <cstdlib>
 #include <unistd.h>
--- a/src/drivers/sdl/sdl-joystick.h
+++ b/src/drivers/sdl/sdl-joystick.h
@ -5,9 +5,9 @@

 #include <string>

-#include "Qt/main.h"
-#include "Qt/input.h"
-#include "Qt/sdl.h"
+#include "sdl/main.h"
+#include "sdl/input.h"
+#include "sdl/sdl.h"

 #define  MAX_JOYSTICKS  32