diff --git a/fceux.pro b/fceux.pro index ab80964c..aa43cddb 100644 --- a/fceux.pro +++ b/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 } diff --git a/src/drivers/Qt/GameApp.cpp b/src/drivers/Qt/GameApp.cpp index 188b77c5..83966b8f 100644 --- a/src/drivers/Qt/GameApp.cpp +++ b/src/drivers/Qt/GameApp.cpp @@ -2,10 +2,10 @@ // #include -#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 ) diff --git a/src/drivers/Qt/GameApp.h b/src/drivers/Qt/GameApp.h index 2f295259..c813f3bf 100644 --- a/src/drivers/Qt/GameApp.h +++ b/src/drivers/Qt/GameApp.h @@ -15,8 +15,8 @@ #include #include -#include "GameViewer.h" -#include "GamePadConf.h" +#include "Qt/GameViewer.h" +#include "Qt/GamePadConf.h" class gameWin_t : public QMainWindow { diff --git a/src/drivers/Qt/GamePadConf.cpp b/src/drivers/Qt/GamePadConf.cpp index a7e9a89b..102a006d 100644 --- a/src/drivers/Qt/GamePadConf.cpp +++ b/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) diff --git a/src/drivers/Qt/GameViewer.cpp b/src/drivers/Qt/GameViewer.cpp index 3814fb73..aa34a9bf 100644 --- a/src/drivers/Qt/GameViewer.cpp +++ b/src/drivers/Qt/GameViewer.cpp @@ -5,8 +5,8 @@ #include #include -#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; diff --git a/src/drivers/Qt/config.cpp b/src/drivers/Qt/config.cpp index 4856cbb2..305439f0 100644 --- a/src/drivers/Qt/config.cpp +++ b/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 diff --git a/src/drivers/Qt/config.h b/src/drivers/Qt/config.h index dbf6a0b6..c413a259 100644 --- a/src/drivers/Qt/config.h +++ b/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 *); diff --git a/src/drivers/Qt/dface.h b/src/drivers/Qt/dface.h index f753f3ca..2f3890ec 100644 --- a/src/drivers/Qt/dface.h +++ b/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[]; diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp index a340dfc8..b077a140 100644 --- a/src/drivers/Qt/fceuWrapper.cpp +++ b/src/drivers/Qt/fceuWrapper.cpp @@ -4,18 +4,18 @@ #include #include -#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" diff --git a/src/drivers/Qt/fceuWrapper.h b/src/drivers/Qt/fceuWrapper.h index 804e8bb8..2d4a1ff7 100644 --- a/src/drivers/Qt/fceuWrapper.h +++ b/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 diff --git a/src/drivers/Qt/gl_win.cpp b/src/drivers/Qt/gl_win.cpp index 111e7fb6..a3fe766e 100644 --- a/src/drivers/Qt/gl_win.cpp +++ b/src/drivers/Qt/gl_win.cpp @@ -9,7 +9,7 @@ #include #include -#include "gl_win.h" +#include "Qt/gl_win.h" gl_win_shm_t *gl_shm = NULL; diff --git a/src/drivers/Qt/gl_win.h b/src/drivers/Qt/gl_win.h index 552c70a9..88776ac8 100644 --- a/src/drivers/Qt/gl_win.h +++ b/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 diff --git a/src/drivers/Qt/input.cpp b/src/drivers/Qt/input.cpp index fe1b4ec7..9cc4aaff 100644 --- a/src/drivers/Qt/input.cpp +++ b/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" diff --git a/src/drivers/Qt/input.h b/src/drivers/Qt/input.h index 2a1a2d85..a62f3233 100644 --- a/src/drivers/Qt/input.h +++ b/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 { diff --git a/src/drivers/Qt/keyscan.cpp b/src/drivers/Qt/keyscan.cpp index 2b3361c5..3dfd1f22 100644 --- a/src/drivers/Qt/keyscan.cpp +++ b/src/drivers/Qt/keyscan.cpp @@ -4,7 +4,7 @@ #include #include -#include "keyscan.h" +#include "Qt/keyscan.h" using namespace Qt; diff --git a/src/drivers/Qt/main.cpp b/src/drivers/Qt/main.cpp index 807ae5d8..fc4b9718 100644 --- a/src/drivers/Qt/main.cpp +++ b/src/drivers/Qt/main.cpp @@ -1,7 +1,7 @@ #include -#include "GameApp.h" -#include "fceuWrapper.h" +#include "Qt/GameApp.h" +#include "Qt/fceuWrapper.h" int main( int argc, char *argv[] ) { diff --git a/src/drivers/Qt/main.h b/src/drivers/Qt/main.h index 9b6963e1..35d5026d 100644 --- a/src/drivers/Qt/main.h +++ b/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 diff --git a/src/drivers/Qt/sdl-joystick.cpp b/src/drivers/Qt/sdl-joystick.cpp index 690b012b..2e6d14a6 100644 --- a/src/drivers/Qt/sdl-joystick.cpp +++ b/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 #include diff --git a/src/drivers/Qt/sdl-sound.cpp b/src/drivers/Qt/sdl-sound.cpp index 00b7c9a6..af01a355 100644 --- a/src/drivers/Qt/sdl-sound.cpp +++ b/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 #include diff --git a/src/drivers/Qt/sdl-throttle.cpp b/src/drivers/Qt/sdl-throttle.cpp index 498d4fe7..7afdb07e 100644 --- a/src/drivers/Qt/sdl-throttle.cpp +++ b/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) diff --git a/src/drivers/Qt/sdl-video.cpp b/src/drivers/Qt/sdl-video.cpp index 4e70a08c..47afb1f6 100644 --- a/src/drivers/Qt/sdl-video.cpp +++ b/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" diff --git a/src/drivers/Qt/sdl.h b/src/drivers/Qt/sdl.h index 91c6414d..82870040 100644 --- a/src/drivers/Qt/sdl.h +++ b/src/drivers/Qt/sdl.h @@ -7,9 +7,9 @@ #include #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 diff --git a/src/drivers/Qt/unix-netplay.cpp b/src/drivers/Qt/unix-netplay.cpp index 37fcba12..9c538d71 100644 --- a/src/drivers/Qt/unix-netplay.cpp +++ b/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 -#include "../common/configSys.h" +#include "common/configSys.h" #include #include diff --git a/src/fceu.cpp b/src/fceu.cpp index 90e295bd..bb311c6c 100644 --- a/src/fceu.cpp +++ b/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 #include