Include path fixes for qmake incorrectly marking sdl folder for heading includes.

fceux.pro

@@ -21,6 +21,8 @@ QT += widgets
 
 CONFIG += object_parallel_to_source
 
+INCLUDEPATH = src   src/drivers
+
 unix {
 	QT_CONFIG -= no-pkg-config
 	CONFIG += link_pkgconfig
@@ -44,7 +46,7 @@ unix {
 	}
 
 	QMAKE_CXXFLAGS -=  -O2 
-	QMAKE_CXXFLAGS +=  -O0  -g3  -Wall  -Wno-write-strings  -Wno-sign-compare  -Wno-parentheses  -Wno-unused-local-typedefs
+	QMAKE_CXXFLAGS +=  -D__QT_DRIVER__  -O0  -g3  -Wall  -Wno-write-strings  -Wno-sign-compare  -Wno-parentheses  -Wno-unused-local-typedefs
 	QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 

src/drivers/Qt/GameApp.cpp

@@ -2,10 +2,10 @@
 //
 #include <QFileDialog>
 
-#include "GameApp.h"
-#include "GamePadConf.h"
-#include "fceuWrapper.h"
-#include "keyscan.h"
+#include "Qt/GameApp.h"
+#include "Qt/GamePadConf.h"
+#include "Qt/fceuWrapper.h"
+#include "Qt/keyscan.h"
 
 gameWin_t::gameWin_t(QWidget *parent)
 	: QMainWindow( parent )

src/drivers/Qt/GameApp.h

@@ -15,8 +15,8 @@
 #include <QKeyEvent>
 #include <QTimer>
 
-#include "GameViewer.h"
-#include "GamePadConf.h"
+#include "Qt/GameViewer.h"
+#include "Qt/GamePadConf.h"
 
 class  gameWin_t : public QMainWindow
 {

src/drivers/Qt/GamePadConf.cpp

@@ -1,11 +1,11 @@
 // GamePadConf.cpp
 //
-#include "GamePadConf.h"
-#include "main.h"
-#include "input.h"
-#include "config.h"
-#include "keyscan.h"
-#include "fceuWrapper.h"
+#include "Qt/GamePadConf.h"
+#include "Qt/main.h"
+#include "Qt/input.h"
+#include "Qt/config.h"
+#include "Qt/keyscan.h"
+#include "Qt/fceuWrapper.h"
 
 //----------------------------------------------------
 GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)

src/drivers/Qt/GameViewer.cpp

@@ -5,8 +5,8 @@
 #include <string.h>
 #include <math.h>
 
-#include "gl_win.h"
-#include "GameViewer.h"
+#include "Qt/gl_win.h"
+#include "Qt/GameViewer.h"
 
 extern unsigned int gui_draw_area_width;
 extern unsigned int gui_draw_area_height;

src/drivers/Qt/config.cpp

@@ -1,15 +1,15 @@
-#include "main.h"
-#include "throttle.h"
-#include "config.h"
+#include "Qt/main.h"
+#include "Qt/throttle.h"
+#include "Qt/config.h"
 
 #include "../common/cheat.h"
 
-#include "input.h"
-#include "dface.h"
+#include "Qt/input.h"
+#include "Qt/dface.h"
 
-#include "sdl.h"
-#include "sdl-video.h"
-#include "unix-netplay.h"
+#include "Qt/sdl.h"
+#include "Qt/sdl-video.h"
+#include "Qt/unix-netplay.h"
 
 #ifdef WIN32
 #include <windows.h>

src/drivers/Qt/config.h

@@ -1,7 +1,7 @@
 #ifndef CONFIG_H_HF128
 #define CONFIG_H_HF128
 
-#include "../common/configSys.h"
+#include "common/configSys.h"
 
 Config *InitConfig(void);
 void UpdateEMUCore(Config *);

src/drivers/Qt/dface.h

@@ -1,7 +1,7 @@
-#include "../common/args.h"
-#include "../common/config.h"
+#include "common/args.h"
+#include "common/config.h"
 
-#include "input.h"
+#include "Qt/input.h"
 
 extern CFGSTRUCT DriverConfig[];
 extern ARGPSTRUCT DriverArgs[];

src/drivers/Qt/fceuWrapper.cpp

@@ -4,18 +4,18 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "main.h"
-#include "throttle.h"
-#include "config.h"
-#include "dface.h"
-#include "fceuWrapper.h"
-#include "input.h"
-#include "sdl.h"
-#include "sdl-video.h"
-#include "gl_win.h"
-#include "unix-netplay.h"
+#include "Qt/main.h"
+#include "Qt/throttle.h"
+#include "Qt/config.h"
+#include "Qt/dface.h"
+#include "Qt/fceuWrapper.h"
+#include "Qt/input.h"
+#include "Qt/sdl.h"
+#include "Qt/sdl-video.h"
+#include "Qt/gl_win.h"
+#include "Qt/unix-netplay.h"
 
-#include "../common/cheat.h"
+#include "common/cheat.h"
 #include "../../fceu.h"
 #include "../../movie.h"
 #include "../../version.h"
@@ -24,7 +24,7 @@
 #include "../../fceulua.h"
 #endif
 
-#include "../common/configSys.h"
+#include "common/configSys.h"
 #include "../../oldmovie.h"
 #include "../../types.h"
 

src/drivers/Qt/fceuWrapper.h

@@ -1,6 +1,6 @@
 // fceuWrapper.h
 //
-#include "config.h"
+#include "Qt/config.h"
 
 //*****************************************************************
 // Define Global Variables to be shared with FCEU Core

src/drivers/Qt/gl_win.cpp

@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "gl_win.h"
+#include "Qt/gl_win.h"
 
 gl_win_shm_t *gl_shm = NULL;
 

src/drivers/Qt/gl_win.h

@@ -1,8 +1,8 @@
-// glxwin.cpp
+// gl_win.cpp
 //
 
-#ifndef __GLXWIN_H__
-#define __GLXWIN_H__
+#ifndef __GL_WIN_H__
+#define __GL_WIN_H__
 
 #include <stdint.h>
 

src/drivers/Qt/input.cpp

@@ -18,16 +18,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "main.h"
-#include "dface.h"
-#include "input.h"
-#include "config.h"
+#include "Qt/main.h"
+#include "Qt/dface.h"
+#include "Qt/input.h"
+#include "Qt/config.h"
 
 
-#include "sdl-video.h"
-#include "sdl.h"
+#include "Qt/sdl-video.h"
+#include "Qt/sdl.h"
 
-#include "../common/cheat.h"
+#include "common/cheat.h"
 #include "../../movie.h"
 #include "../../fceu.h"
 #include "../../driver.h"

src/drivers/Qt/input.h

@@ -1,7 +1,7 @@
 #ifndef _aosdfjk02fmasf
 #define _aosdfjk02fmasf
 
-#include "../common/configSys.h"
+#include "common/configSys.h"
 
 #define MAXBUTTCONFIG   4
 typedef struct {

src/drivers/Qt/keyscan.cpp

@@ -4,7 +4,7 @@
 #include <QtCore>
 #include <SDL2/SDL.h>
 
-#include "keyscan.h"
+#include "Qt/keyscan.h"
 
 using namespace Qt;
 

src/drivers/Qt/main.cpp

@@ -1,7 +1,7 @@
 #include <QApplication>
 
-#include "GameApp.h"
-#include "fceuWrapper.h"
+#include "Qt/GameApp.h"
+#include "Qt/fceuWrapper.h"
 
 int main( int argc, char *argv[] )
 {

src/drivers/Qt/main.h

@@ -21,8 +21,8 @@
 #define __FCEU_SDL_MAIN_H
 
 #include "../../driver.h"
-#include "../common/config.h"
-#include "../common/args.h"
+#include "common/config.h"
+#include "common/args.h"
 
 extern int eoptions;
 #define EO_NO8LIM      1

src/drivers/Qt/sdl-joystick.cpp

@@ -22,7 +22,7 @@
 /// \file
 /// \brief Handles joystick input using the SDL.
 
-#include "sdl.h"
+#include "Qt/sdl.h"
 
 #include <cstdlib>
 #include <unistd.h>

src/drivers/Qt/sdl-sound.cpp

@@ -23,8 +23,8 @@
 
 #include "sdl.h"
 
-#include "../common/configSys.h"
-#include "../../utils/memory.h"
+#include "common/configSys.h"
+#include "utils/memory.h"
 
 #include <cstdio>
 #include <cstring>

src/drivers/Qt/sdl-throttle.cpp

@@ -1,8 +1,8 @@
 /// \file
 /// \brief Handles emulation speed throttling using the SDL timing functions.
 
-#include "sdl.h"
-#include "throttle.h"
+#include "Qt/sdl.h"
+#include "Qt/throttle.h"
 
 static const double Slowest = 0.015625; // 1/64x speed (around 1 fps on NTSC)
 static const double Fastest = 32;       // 32x speed   (around 1920 fps on NTSC)

src/drivers/Qt/sdl-video.cpp

@@ -21,21 +21,21 @@
 /// \file
 /// \brief Handles the graphical game display for the SDL implementation.
 
-#include "sdl.h"
-#include "gl_win.h"
-#include "../common/vidblit.h"
+#include "Qt/sdl.h"
+#include "Qt/gl_win.h"
+#include "common/vidblit.h"
 #include "../../fceu.h"
 #include "../../version.h"
 #include "../../video.h"
 
-#include "../../utils/memory.h"
+#include "utils/memory.h"
 
 //#include "sdl-icon.h"
-#include "dface.h"
+#include "Qt/dface.h"
 
-#include "../common/configSys.h"
-#include "sdl-video.h"
-#include "fceuWrapper.h"
+#include "common/configSys.h"
+#include "Qt/sdl-video.h"
+#include "Qt/fceuWrapper.h"
 
 #ifdef CREATE_AVI
 #include "../videolog/nesvideos-piece.h"

src/drivers/Qt/sdl.h

@@ -7,9 +7,9 @@
 #include <SDL.h>
 #endif
 
-#include "main.h"
-#include "dface.h"
-#include "input.h"
+#include "Qt/main.h"
+#include "Qt/dface.h"
+#include "Qt/input.h"
 
 // I'm using this as a #define so the compiler can optimize the
 // modulo operation

src/drivers/Qt/unix-netplay.cpp

@@ -21,18 +21,18 @@
 //todo - ensure that #ifdef WIN32 makes sense
 //consider changing this to use sdl net stuff?
 
-//#include "main.h"
-//#include "input.h"
-//#include "dface.h"
-#include "unix-netplay.h"
+//#include "Qt/main.h"
+//#include "Qt/input.h"
+//#include "Qt/dface.h"
+#include "Qt/unix-netplay.h"
 
 #include "../../fceu.h"
 #include "../../driver.h"
-#include "../../utils/md5.h"
-#include "../../utils/memory.h"
+#include "utils/md5.h"
+#include "utils/memory.h"
 
 #include <string>
-#include "../common/configSys.h"
+#include "common/configSys.h"
 
 #include <unistd.h>
 #include <sys/types.h>

src/fceu.cpp

@@ -75,8 +75,12 @@ extern void RefreshThrottleFPS();
 #include "drivers/win/memwatch.h"
 #include "drivers/win/tracer.h"
 #else
+#ifdef __QT_DRIVER__
+#include "drivers/Qt/sdl.h"
+#else
 #include "drivers/sdl/sdl.h"
 #endif
+#endif
 
 #include <fstream>
 #include <sstream>