Move Qt media framework to a separate subdir

git-svn-id: https://gambatte.svn.sourceforge.net/svnroot/gambatte@177 9dfb2916-2d38-0410-aef4-c5fe6c9ffc24
sinamas · Oct 16, 2008 · e961397 · e961397
1 parent 21a5062
commit e961397
Show file tree

Hide file tree

Showing 96 changed files with 174 additions and 176 deletions.
diff --git a/gambatte_qt/gambatte_qt.pro b/gambatte_qt/gambatte_qt.pro
@@ -1,5 +1,2 @@
 SUBDIRS += src
-TEMPLATE = subdirs 
-CONFIG += warn_on \
-          qt \
-          thread 
+TEMPLATE = subdirs
diff --git a/..._qt/src/SDL_Joystick/include/SDL_config.h → ...amework/SDL_Joystick/include/SDL_config.h b/..._qt/src/SDL_Joystick/include/SDL_config.h → ...amework/SDL_Joystick/include/SDL_config.h
diff --git a/...e_qt/src/SDL_Joystick/include/SDL_error.h → ...ramework/SDL_Joystick/include/SDL_error.h b/...e_qt/src/SDL_Joystick/include/SDL_error.h → ...ramework/SDL_Joystick/include/SDL_error.h
diff --git a/...e_qt/src/SDL_Joystick/include/SDL_event.h → ...ramework/SDL_Joystick/include/SDL_event.h b/...e_qt/src/SDL_Joystick/include/SDL_event.h → ...ramework/SDL_Joystick/include/SDL_event.h
diff --git a/...t/src/SDL_Joystick/include/SDL_joystick.h → ...ework/SDL_Joystick/include/SDL_joystick.h b/...t/src/SDL_Joystick/include/SDL_joystick.h → ...ework/SDL_Joystick/include/SDL_joystick.h
diff --git a/..._qt/src/SDL_Joystick/include/SDL_stdinc.h → ...amework/SDL_Joystick/include/SDL_stdinc.h b/..._qt/src/SDL_Joystick/include/SDL_stdinc.h → ...amework/SDL_Joystick/include/SDL_stdinc.h
diff --git a/gambatte_qt/src/SDL_Joystick/lgpl-2.1.txt → ...t/src/framework/SDL_Joystick/lgpl-2.1.txt b/gambatte_qt/src/SDL_Joystick/lgpl-2.1.txt → ...t/src/framework/SDL_Joystick/lgpl-2.1.txt
diff --git a/gambatte_qt/src/SDL_Joystick/src/SDL_error.c → ...rc/framework/SDL_Joystick/src/SDL_error.c b/gambatte_qt/src/SDL_Joystick/src/SDL_error.c → ...rc/framework/SDL_Joystick/src/SDL_error.c
diff --git a/...tte_qt/src/SDL_Joystick/src/SDL_error_c.h → .../framework/SDL_Joystick/src/SDL_error_c.h b/...tte_qt/src/SDL_Joystick/src/SDL_error_c.h → .../framework/SDL_Joystick/src/SDL_error_c.h
diff --git a/...tte_qt/src/SDL_Joystick/src/SDL_event.cpp → .../framework/SDL_Joystick/src/SDL_event.cpp b/...tte_qt/src/SDL_Joystick/src/SDL_event.cpp → .../framework/SDL_Joystick/src/SDL_event.cpp
diff --git a/...te_qt/src/SDL_Joystick/src/SDL_joystick.c → ...framework/SDL_Joystick/src/SDL_joystick.c b/...te_qt/src/SDL_Joystick/src/SDL_joystick.c → ...framework/SDL_Joystick/src/SDL_joystick.c
diff --git a/..._qt/src/SDL_Joystick/src/SDL_joystick_c.h → ...amework/SDL_Joystick/src/SDL_joystick_c.h b/..._qt/src/SDL_Joystick/src/SDL_joystick_c.h → ...amework/SDL_Joystick/src/SDL_joystick_c.h
diff --git a/...atte_qt/src/SDL_Joystick/src/SDL_string.c → ...c/framework/SDL_Joystick/src/SDL_string.c b/...atte_qt/src/SDL_Joystick/src/SDL_string.c → ...c/framework/SDL_Joystick/src/SDL_string.c
diff --git a/...qt/src/SDL_Joystick/src/SDL_sysjoystick.h → ...mework/SDL_Joystick/src/SDL_sysjoystick.h b/...qt/src/SDL_Joystick/src/SDL_sysjoystick.h → ...mework/SDL_Joystick/src/SDL_sysjoystick.h
diff --git a/...rc/SDL_Joystick/src/bsd/SDL_sysjoystick.c → ...rk/SDL_Joystick/src/bsd/SDL_sysjoystick.c b/...rc/SDL_Joystick/src/bsd/SDL_sysjoystick.c → ...rk/SDL_Joystick/src/bsd/SDL_sysjoystick.c
diff --git a/...SDL_Joystick/src/darwin/SDL_sysjoystick.c → ...SDL_Joystick/src/darwin/SDL_sysjoystick.c b/...SDL_Joystick/src/darwin/SDL_sysjoystick.c → ...SDL_Joystick/src/darwin/SDL_sysjoystick.c
diff --git a/.../SDL_Joystick/src/dummy/SDL_sysjoystick.c → .../SDL_Joystick/src/dummy/SDL_sysjoystick.c b/.../SDL_Joystick/src/dummy/SDL_sysjoystick.c → .../SDL_Joystick/src/dummy/SDL_sysjoystick.c
diff --git a/.../SDL_Joystick/src/linux/SDL_sysjoystick.c → .../SDL_Joystick/src/linux/SDL_sysjoystick.c b/.../SDL_Joystick/src/linux/SDL_sysjoystick.c → .../SDL_Joystick/src/linux/SDL_sysjoystick.c
diff --git a/...c/SDL_Joystick/src/win32/SDL_mmjoystick.c → ...k/SDL_Joystick/src/win32/SDL_mmjoystick.c b/...c/SDL_Joystick/src/win32/SDL_mmjoystick.c → ...k/SDL_Joystick/src/win32/SDL_mmjoystick.c
diff --git a/gambatte_qt/src/addaudioengines.cpp → ...atte_qt/src/framework/addaudioengines.cpp b/gambatte_qt/src/addaudioengines.cpp → ...atte_qt/src/framework/addaudioengines.cpp
diff --git a/gambatte_qt/src/addaudioengines.h → gambatte_qt/src/framework/addaudioengines.h b/gambatte_qt/src/addaudioengines.h → gambatte_qt/src/framework/addaudioengines.h
diff --git a/gambatte_qt/src/addaudioengines_linux.cpp → ...t/src/framework/addaudioengines_linux.cpp b/gambatte_qt/src/addaudioengines_linux.cpp → ...t/src/framework/addaudioengines_linux.cpp
diff --git a/gambatte_qt/src/addaudioengines_macx.cpp → ...qt/src/framework/addaudioengines_macx.cpp b/gambatte_qt/src/addaudioengines_macx.cpp → ...qt/src/framework/addaudioengines_macx.cpp
diff --git a/gambatte_qt/src/addaudioengines_unix.cpp → ...qt/src/framework/addaudioengines_unix.cpp b/gambatte_qt/src/addaudioengines_unix.cpp → ...qt/src/framework/addaudioengines_unix.cpp
diff --git a/gambatte_qt/src/addaudioengines_win32.cpp → ...t/src/framework/addaudioengines_win32.cpp b/gambatte_qt/src/addaudioengines_win32.cpp → ...t/src/framework/addaudioengines_win32.cpp
diff --git a/gambatte_qt/src/addblitterwidgets.cpp → ...te_qt/src/framework/addblitterwidgets.cpp b/gambatte_qt/src/addblitterwidgets.cpp → ...te_qt/src/framework/addblitterwidgets.cpp
diff --git a/gambatte_qt/src/addblitterwidgets.h → ...atte_qt/src/framework/addblitterwidgets.h b/gambatte_qt/src/addblitterwidgets.h → ...atte_qt/src/framework/addblitterwidgets.h
diff --git a/gambatte_qt/src/addblitterwidgets_unix.cpp → .../src/framework/addblitterwidgets_unix.cpp b/gambatte_qt/src/addblitterwidgets_unix.cpp → .../src/framework/addblitterwidgets_unix.cpp
diff --git a/gambatte_qt/src/addblitterwidgets_win32.cpp → ...src/framework/addblitterwidgets_win32.cpp b/gambatte_qt/src/addblitterwidgets_win32.cpp → ...src/framework/addblitterwidgets_win32.cpp
diff --git a/gambatte_qt/src/audioengine.h → gambatte_qt/src/framework/audioengine.h b/gambatte_qt/src/audioengine.h → gambatte_qt/src/framework/audioengine.h
diff --git a/gambatte_qt/src/audioengines/alsaengine.cpp → ...src/framework/audioengines/alsaengine.cpp b/gambatte_qt/src/audioengines/alsaengine.cpp → ...src/framework/audioengines/alsaengine.cpp
diff --git a/gambatte_qt/src/audioengines/alsaengine.h → ...t/src/framework/audioengines/alsaengine.h b/gambatte_qt/src/audioengines/alsaengine.h → ...t/src/framework/audioengines/alsaengine.h
diff --git a/gambatte_qt/src/audioengines/aoengine.cpp → ...t/src/framework/audioengines/aoengine.cpp b/gambatte_qt/src/audioengines/aoengine.cpp → ...t/src/framework/audioengines/aoengine.cpp
diff --git a/gambatte_qt/src/audioengines/aoengine.h → ..._qt/src/framework/audioengines/aoengine.h b/gambatte_qt/src/audioengines/aoengine.h → ..._qt/src/framework/audioengines/aoengine.h
diff --git a/...tte_qt/src/audioengines/customdevconf.cpp → .../framework/audioengines/customdevconf.cpp b/...tte_qt/src/audioengines/customdevconf.cpp → .../framework/audioengines/customdevconf.cpp
diff --git a/gambatte_qt/src/audioengines/customdevconf.h → ...rc/framework/audioengines/customdevconf.h b/gambatte_qt/src/audioengines/customdevconf.h → ...rc/framework/audioengines/customdevconf.h
diff --git a/...qt/src/audioengines/directsoundengine.cpp → ...mework/audioengines/directsoundengine.cpp b/...qt/src/audioengines/directsoundengine.cpp → ...mework/audioengines/directsoundengine.cpp
diff --git a/...e_qt/src/audioengines/directsoundengine.h → ...ramework/audioengines/directsoundengine.h b/...e_qt/src/audioengines/directsoundengine.h → ...ramework/audioengines/directsoundengine.h
diff --git a/...tte_qt/src/audioengines/nullaudioengine.h → .../framework/audioengines/nullaudioengine.h b/...tte_qt/src/audioengines/nullaudioengine.h → .../framework/audioengines/nullaudioengine.h
@@ -19,7 +19,7 @@
 #ifndef NULLAUDIOENGINE_H
 #define NULLAUDIOENGINE_H
 
-#include "audioengine.h"
+#include "../audioengine.h"
 
 class NullAudioEngine : public AudioEngine {
 	int doInit(int rate, unsigned /*latency*/) { return rate; }

diff --git a/...atte_qt/src/audioengines/openalengine.cpp → ...c/framework/audioengines/openalengine.cpp b/...atte_qt/src/audioengines/openalengine.cpp → ...c/framework/audioengines/openalengine.cpp
diff --git a/gambatte_qt/src/audioengines/openalengine.h → ...src/framework/audioengines/openalengine.h b/gambatte_qt/src/audioengines/openalengine.h → ...src/framework/audioengines/openalengine.h
diff --git a/gambatte_qt/src/audioengines/ossengine.cpp → .../src/framework/audioengines/ossengine.cpp b/gambatte_qt/src/audioengines/ossengine.cpp → .../src/framework/audioengines/ossengine.cpp
diff --git a/gambatte_qt/src/audioengines/ossengine.h → ...qt/src/framework/audioengines/ossengine.h b/gambatte_qt/src/audioengines/ossengine.h → ...qt/src/framework/audioengines/ossengine.h
diff --git a/gambatte_qt/src/blittercontainer.cpp → ...tte_qt/src/framework/blittercontainer.cpp b/gambatte_qt/src/blittercontainer.cpp → ...tte_qt/src/framework/blittercontainer.cpp
diff --git a/gambatte_qt/src/blittercontainer.h → gambatte_qt/src/framework/blittercontainer.h b/gambatte_qt/src/blittercontainer.h → gambatte_qt/src/framework/blittercontainer.h
diff --git a/gambatte_qt/src/blitterwidget.cpp → gambatte_qt/src/framework/blitterwidget.cpp b/gambatte_qt/src/blitterwidget.cpp → gambatte_qt/src/framework/blitterwidget.cpp
diff --git a/gambatte_qt/src/blitterwidget.h → gambatte_qt/src/framework/blitterwidget.h b/gambatte_qt/src/blitterwidget.h → gambatte_qt/src/framework/blitterwidget.h
diff --git a/...qt/src/blitterwidgets/direct3dblitter.cpp → ...mework/blitterwidgets/direct3dblitter.cpp b/...qt/src/blitterwidgets/direct3dblitter.cpp → ...mework/blitterwidgets/direct3dblitter.cpp
diff --git a/...e_qt/src/blitterwidgets/direct3dblitter.h → ...ramework/blitterwidgets/direct3dblitter.h b/...e_qt/src/blitterwidgets/direct3dblitter.h → ...ramework/blitterwidgets/direct3dblitter.h
diff --git a/.../src/blitterwidgets/directdrawblitter.cpp → ...work/blitterwidgets/directdrawblitter.cpp b/.../src/blitterwidgets/directdrawblitter.cpp → ...work/blitterwidgets/directdrawblitter.cpp
diff --git a/...qt/src/blitterwidgets/directdrawblitter.h → ...mework/blitterwidgets/directdrawblitter.h b/...qt/src/blitterwidgets/directdrawblitter.h → ...mework/blitterwidgets/directdrawblitter.h
diff --git a/...atte_qt/src/blitterwidgets/qglblitter.cpp → ...c/framework/blitterwidgets/qglblitter.cpp b/...atte_qt/src/blitterwidgets/qglblitter.cpp → ...c/framework/blitterwidgets/qglblitter.cpp
diff --git a/gambatte_qt/src/blitterwidgets/qglblitter.h → ...src/framework/blitterwidgets/qglblitter.h b/gambatte_qt/src/blitterwidgets/qglblitter.h → ...src/framework/blitterwidgets/qglblitter.h
diff --git a/...qt/src/blitterwidgets/qpainterblitter.cpp → ...mework/blitterwidgets/qpainterblitter.cpp b/...qt/src/blitterwidgets/qpainterblitter.cpp → ...mework/blitterwidgets/qpainterblitter.cpp
diff --git a/...e_qt/src/blitterwidgets/qpainterblitter.h → ...ramework/blitterwidgets/qpainterblitter.h b/...e_qt/src/blitterwidgets/qpainterblitter.h → ...ramework/blitterwidgets/qpainterblitter.h
diff --git a/...atte_qt/src/blitterwidgets/x11blitter.cpp → ...c/framework/blitterwidgets/x11blitter.cpp b/...atte_qt/src/blitterwidgets/x11blitter.cpp → ...c/framework/blitterwidgets/x11blitter.cpp
@@ -28,7 +28,6 @@
 #include <QVBoxLayout>
 #include <QCheckBox>
 #include <QSettings>
-#include <videoblitter.h>
 #include <iostream>
 
 class X11Blitter::SubBlitter {

diff --git a/gambatte_qt/src/blitterwidgets/x11blitter.h → ...src/framework/blitterwidgets/x11blitter.h b/gambatte_qt/src/blitterwidgets/x11blitter.h → ...src/framework/blitterwidgets/x11blitter.h
diff --git a/gambatte_qt/src/blitterwidgets/xvblitter.cpp → ...rc/framework/blitterwidgets/xvblitter.cpp b/gambatte_qt/src/blitterwidgets/xvblitter.cpp → ...rc/framework/blitterwidgets/xvblitter.cpp
diff --git a/gambatte_qt/src/blitterwidgets/xvblitter.h → .../src/framework/blitterwidgets/xvblitter.h b/gambatte_qt/src/blitterwidgets/xvblitter.h → .../src/framework/blitterwidgets/xvblitter.h
diff --git a/gambatte_qt/src/framework/framework.pro b/gambatte_qt/src/framework/framework.pro
@@ -0,0 +1,159 @@
+SOURCES += framework/videodialog.cpp \
+    framework/blittercontainer.cpp \
+    framework/inputdialog.cpp \
+    framework/blitterwidgets/qglblitter.cpp \
+    framework/blitterwidgets/qpainterblitter.cpp \
+    framework/SDL_Joystick/src/SDL_event.cpp \
+    framework/SDL_Joystick/src/SDL_error.c \
+    framework/SDL_Joystick/src/SDL_joystick.c \
+    framework/SDL_Joystick/src/SDL_string.c \
+    framework/sounddialog.cpp \
+    framework/audioengines/customdevconf.cpp \
+    framework/mainwindow.cpp \
+    framework/blitterwidget.cpp
+SOURCES += $$COMMONPATH/resample/chainresampler.cpp \
+	$$COMMONPATH/resample/u48div.cpp \
+	$$COMMONPATH/resample/resamplerinfo.cpp \
+	$$COMMONPATH/adaptivesleep.cpp \
+	$$COMMONPATH/rateest.cpp
+HEADERS += framework/blitterwidget.h \
+    framework/fullmodetoggler.h \
+    framework/videodialog.h \
+    framework/blittercontainer.h \
+    framework/resinfo.h \
+    framework/inputdialog.h \
+    framework/audioengine.h \
+    framework/addaudioengines.h \
+    framework/addblitterwidgets.h \
+    framework/getfullmodetoggler.h \
+    framework/blitterwidgets/qglblitter.h \
+    framework/blitterwidgets/qpainterblitter.h \
+    framework/fullmodetogglers/nulltoggler.h \
+    framework/SDL_Joystick/include/SDL_config.h \
+    framework/SDL_Joystick/include/SDL_error.h \
+    framework/SDL_Joystick/include/SDL_event.h \
+    framework/SDL_Joystick/include/SDL_joystick.h \
+    framework/SDL_Joystick/include/SDL_stdinc.h \
+    framework/SDL_Joystick/src/SDL_error_c.h \
+    framework/SDL_Joystick/src/SDL_joystick_c.h \
+    framework/SDL_Joystick/src/SDL_sysjoystick.h \
+    framework/sounddialog.h \
+    framework/audioengines/nullaudioengine.h \
+    framework/audioengines/customdevconf.h \
+    framework/mediasource.h \
+    framework/pixelbuffersetter.h \
+    framework/mainwindow.h \
+    framework/swscale.h \
+    framework/rational.h
+HEADERS += $$COMMONPATH/resample/blackmansinc.h \
+	$$COMMONPATH/resample/chainresampler.h \
+	$$COMMONPATH/resample/cic2.h \
+	$$COMMONPATH/resample/cic3.h \
+	$$COMMONPATH/resample/cic4.h \
+	$$COMMONPATH/resample/convoluter.h \
+	$$COMMONPATH/resample/hammingsinc.h \
+	$$COMMONPATH/resample/linint.h \
+	$$COMMONPATH/resample/makesinckernel.h \
+	$$COMMONPATH/resample/rectsinc.h \
+	$$COMMONPATH/resample/resampler.h \
+	$$COMMONPATH/resample/subresampler.h \
+	$$COMMONPATH/resample/u48div.h \
+	$$COMMONPATH/resample/upsampler.h \
+	$$COMMONPATH/resample/resamplerinfo.h \
+	$$COMMONPATH/adaptivesleep.h \
+	$$COMMONPATH/usec.h \
+	$$COMMONPATH/rateest.h
+CONFIG += qt
+QT += opengl
+INCLUDEPATH += framework/SDL_Joystick/include
+INCLUDEPATH += $$COMMONPATH
+DEFINES += HAVE_STDINT_H
+
+# QMAKE_CXXFLAGS = -g
+macx { 
+    SOURCES += framework/addaudioengines_macx.cpp \
+        framework/addblitterwidgets.cpp \
+        framework/getfullmodetoggler_macx.cpp
+    SOURCES += framework/SDL_Joystick/src/darwin/SDL_sysjoystick.c \
+        framework/audioengines/openalengine.cpp \
+        framework/fullmodetogglers/quartztoggler.cpp
+    HEADERS += framework/audioengines/openalengine.h \
+        framework/fullmodetogglers/quartztoggler.h
+    LIBS += -framework \
+        IOKit \
+        -framework \
+        OpenAL
+}
+else:unix { 
+    DEFINES += PLATFORM_UNIX
+    SOURCES += framework/x11getprocaddress.cpp \
+        framework/addblitterwidgets_unix.cpp \
+        framework/getfullmodetoggler_unix.cpp \
+        framework/audioengines/ossengine.cpp \
+        framework/blitterwidgets/xvblitter.cpp \
+        framework/blitterwidgets/x11blitter.cpp \
+        framework/fullmodetogglers/xrandrtoggler.cpp #\
+#        framework/fullmodetogglers/xf86vidmodetoggler.cpp
+    HEADERS += framework/x11getprocaddress.h \
+        framework/audioengines/ossengine.h \
+        framework/blitterwidgets/xvblitter.h \
+        framework/blitterwidgets/x11blitter.h \
+        framework/fullmodetogglers/xrandrtoggler.h #\
+#        framework/fullmodetogglers/xf86vidmodetoggler.h
+    LIBS += -L/usr/X11R6/lib \
+        -lXv \
+        -lXrandr #\
+#        -lXxf86vm \
+#        -lXinerama
+    linux-g++ { 
+        SOURCES += framework/addaudioengines_linux.cpp \
+            framework/audioengines/alsaengine.cpp \
+            framework/SDL_Joystick/src/linux/SDL_sysjoystick.c
+        HEADERS += framework/audioengines/alsaengine.h
+        LIBS += -lasound
+    }
+    else { 
+        SOURCES += framework/addaudioengines_unix.cpp
+        freebsd-g++|netbsd-g++|openbsd-g++ { 
+            exists( /usr/include/usb.h ):DEFINES += HAVE_USB_H
+            exists( /usr/include/usbhid.h ):DEFINES += HAVE_USBHID_H
+            exists( /usr/include/libusb.h ):DEFINES += HAVE_LIBUSB_H
+            exists( /usr/include/libusbhid.h ):DEFINES += HAVE_LIBUSBHID_H
+            SOURCES += framework/SDL_Joystick/src/bsd/SDL_sysjoystick.c
+        }
+        else:darwin-g++:SOURCES += framework/SDL_Joystick/src/darwin/SDL_sysjoystick.c
+        else:SOURCES += framework/SDL_Joystick/src/dummy/SDL_sysjoystick.c
+    }
+}
+else:win32 { 
+    DEFINES += PLATFORM_WIN32
+    SOURCES += framework/gdisettings.cpp \
+        framework/blitterwidgets/direct3dblitter.cpp \
+        framework/getfullmodetoggler_win32.cpp \
+        framework/addaudioengines_win32.cpp \
+        framework/addblitterwidgets_win32.cpp \
+        framework/audioengines/directsoundengine.cpp \
+        framework/blitterwidgets/directdrawblitter.cpp \
+        framework/fullmodetogglers/gditoggler.cpp \
+        framework/SDL_Joystick/src/win32/SDL_mmjoystick.c
+    HEADERS += framework/gdisettings.h \
+        framework/blitterwidgets/direct3dblitter.h \
+        framework/audioengines/directsoundengine.h \
+        framework/blitterwidgets/directdrawblitter.h \
+        framework/fullmodetogglers/gditoggler.h
+    LIBS += -lwinmm \
+        -lddraw \
+        -ldxguid \
+        -ldsound
+}
+else { 
+    SOURCES += framework/addaudioengines.cpp \
+        framework/addblitterwidgets.cpp \
+        framework/getfullmodetoggler.cpp \
+        framework/blitterwidget.cpp \
+        framework/audioengines/aoengine.cpp
+    SOURCES += framework/SDL_Joystick/src/dummy/SDL_sysjoystick.c
+    HEADERS += framework/audioengines/aoengine.h
+    CONFIG += link_pkgconfig
+    PKGCONFIG += ao
+}
diff --git a/gambatte_qt/src/fullmodetoggler.h → gambatte_qt/src/framework/fullmodetoggler.h b/gambatte_qt/src/fullmodetoggler.h → gambatte_qt/src/framework/fullmodetoggler.h
diff --git a/...te_qt/src/fullmodetogglers/gditoggler.cpp → ...framework/fullmodetogglers/gditoggler.cpp b/...te_qt/src/fullmodetogglers/gditoggler.cpp → ...framework/fullmodetogglers/gditoggler.cpp
diff --git a/...atte_qt/src/fullmodetogglers/gditoggler.h → ...c/framework/fullmodetogglers/gditoggler.h b/...atte_qt/src/fullmodetogglers/gditoggler.h → ...c/framework/fullmodetogglers/gditoggler.h
diff --git a/...tte_qt/src/fullmodetogglers/nulltoggler.h → .../framework/fullmodetogglers/nulltoggler.h b/...tte_qt/src/fullmodetogglers/nulltoggler.h → .../framework/fullmodetogglers/nulltoggler.h
diff --git a/...qt/src/fullmodetogglers/quartztoggler.cpp → ...mework/fullmodetogglers/quartztoggler.cpp b/...qt/src/fullmodetogglers/quartztoggler.cpp → ...mework/fullmodetogglers/quartztoggler.cpp
diff --git a/...e_qt/src/fullmodetogglers/quartztoggler.h → ...ramework/fullmodetogglers/quartztoggler.h b/...e_qt/src/fullmodetogglers/quartztoggler.h → ...ramework/fullmodetogglers/quartztoggler.h
diff --git a/...c/fullmodetogglers/xf86vidmodetoggler.cpp → ...k/fullmodetogglers/xf86vidmodetoggler.cpp b/...c/fullmodetogglers/xf86vidmodetoggler.cpp → ...k/fullmodetogglers/xf86vidmodetoggler.cpp
diff --git a/...src/fullmodetogglers/xf86vidmodetoggler.h → ...ork/fullmodetogglers/xf86vidmodetoggler.h b/...src/fullmodetogglers/xf86vidmodetoggler.h → ...ork/fullmodetogglers/xf86vidmodetoggler.h
diff --git a/...qt/src/fullmodetogglers/xrandrtoggler.cpp → ...mework/fullmodetogglers/xrandrtoggler.cpp b/...qt/src/fullmodetogglers/xrandrtoggler.cpp → ...mework/fullmodetogglers/xrandrtoggler.cpp
diff --git a/...e_qt/src/fullmodetogglers/xrandrtoggler.h → ...ramework/fullmodetogglers/xrandrtoggler.h b/...e_qt/src/fullmodetogglers/xrandrtoggler.h → ...ramework/fullmodetogglers/xrandrtoggler.h
diff --git a/gambatte_qt/src/gdisettings.cpp → gambatte_qt/src/framework/gdisettings.cpp b/gambatte_qt/src/gdisettings.cpp → gambatte_qt/src/framework/gdisettings.cpp
diff --git a/gambatte_qt/src/gdisettings.h → gambatte_qt/src/framework/gdisettings.h b/gambatte_qt/src/gdisettings.h → gambatte_qt/src/framework/gdisettings.h
diff --git a/gambatte_qt/src/getfullmodetoggler.cpp → ...e_qt/src/framework/getfullmodetoggler.cpp b/gambatte_qt/src/getfullmodetoggler.cpp → ...e_qt/src/framework/getfullmodetoggler.cpp
diff --git a/gambatte_qt/src/getfullmodetoggler.h → ...tte_qt/src/framework/getfullmodetoggler.h b/gambatte_qt/src/getfullmodetoggler.h → ...tte_qt/src/framework/getfullmodetoggler.h
diff --git a/gambatte_qt/src/getfullmodetoggler_macx.cpp → ...src/framework/getfullmodetoggler_macx.cpp b/gambatte_qt/src/getfullmodetoggler_macx.cpp → ...src/framework/getfullmodetoggler_macx.cpp
diff --git a/gambatte_qt/src/getfullmodetoggler_unix.cpp → ...src/framework/getfullmodetoggler_unix.cpp b/gambatte_qt/src/getfullmodetoggler_unix.cpp → ...src/framework/getfullmodetoggler_unix.cpp
diff --git a/gambatte_qt/src/getfullmodetoggler_win32.cpp → ...rc/framework/getfullmodetoggler_win32.cpp b/gambatte_qt/src/getfullmodetoggler_win32.cpp → ...rc/framework/getfullmodetoggler_win32.cpp
diff --git a/gambatte_qt/src/inputdialog.cpp → gambatte_qt/src/framework/inputdialog.cpp b/gambatte_qt/src/inputdialog.cpp → gambatte_qt/src/framework/inputdialog.cpp
diff --git a/gambatte_qt/src/inputdialog.h → gambatte_qt/src/framework/inputdialog.h b/gambatte_qt/src/inputdialog.h → gambatte_qt/src/framework/inputdialog.h
diff --git a/gambatte_qt/src/mainwindow.cpp → gambatte_qt/src/framework/mainwindow.cpp b/gambatte_qt/src/mainwindow.cpp → gambatte_qt/src/framework/mainwindow.cpp
diff --git a/gambatte_qt/src/mainwindow.h → gambatte_qt/src/framework/mainwindow.h b/gambatte_qt/src/mainwindow.h → gambatte_qt/src/framework/mainwindow.h
diff --git a/gambatte_qt/src/mediasource.h → gambatte_qt/src/framework/mediasource.h b/gambatte_qt/src/mediasource.h → gambatte_qt/src/framework/mediasource.h
diff --git a/gambatte_qt/src/pixelbuffersetter.h → ...atte_qt/src/framework/pixelbuffersetter.h b/gambatte_qt/src/pixelbuffersetter.h → ...atte_qt/src/framework/pixelbuffersetter.h
diff --git a/gambatte_qt/src/rational.h → gambatte_qt/src/framework/rational.h b/gambatte_qt/src/rational.h → gambatte_qt/src/framework/rational.h
diff --git a/gambatte_qt/src/resinfo.h → gambatte_qt/src/framework/resinfo.h b/gambatte_qt/src/resinfo.h → gambatte_qt/src/framework/resinfo.h
diff --git a/gambatte_qt/src/sounddialog.cpp → gambatte_qt/src/framework/sounddialog.cpp b/gambatte_qt/src/sounddialog.cpp → gambatte_qt/src/framework/sounddialog.cpp
diff --git a/gambatte_qt/src/sounddialog.h → gambatte_qt/src/framework/sounddialog.h b/gambatte_qt/src/sounddialog.h → gambatte_qt/src/framework/sounddialog.h
diff --git a/gambatte_qt/src/swscale.h → gambatte_qt/src/framework/swscale.h b/gambatte_qt/src/swscale.h → gambatte_qt/src/framework/swscale.h
diff --git a/gambatte_qt/src/videodialog.cpp → gambatte_qt/src/framework/videodialog.cpp b/gambatte_qt/src/videodialog.cpp → gambatte_qt/src/framework/videodialog.cpp
diff --git a/gambatte_qt/src/videodialog.h → gambatte_qt/src/framework/videodialog.h b/gambatte_qt/src/videodialog.h → gambatte_qt/src/framework/videodialog.h
diff --git a/gambatte_qt/src/x11getprocaddress.cpp → ...te_qt/src/framework/x11getprocaddress.cpp b/gambatte_qt/src/x11getprocaddress.cpp → ...te_qt/src/framework/x11getprocaddress.cpp
diff --git a/gambatte_qt/src/x11getprocaddress.h → ...atte_qt/src/framework/x11getprocaddress.h b/gambatte_qt/src/x11getprocaddress.h → ...atte_qt/src/framework/x11getprocaddress.h
diff --git a/gambatte_qt/src/gambattemenuhandler.cpp b/gambatte_qt/src/gambattemenuhandler.cpp
@@ -22,7 +22,7 @@
 #include <QActionGroup>
 #include <QFileInfo>
 #include "palettedialog.h"
-#include "mainwindow.h"
+#include "framework/mainwindow.h"
 #include "gambattesource.h"
 
 static const QString strippedName(const QString &fullFileName) {

diff --git a/gambatte_qt/src/gambattesource.h b/gambatte_qt/src/gambattesource.h
@@ -19,7 +19,7 @@
 #ifndef GAMBATTESOURCE_H
 #define GAMBATTESOURCE_H
 
-#include "mediasource.h"
+#include "framework/mediasource.h"
 #include <gambatte.h>
 #include <cstring>
 #include <QObject>

diff --git a/gambatte_qt/src/main.cpp b/gambatte_qt/src/main.cpp
@@ -19,7 +19,7 @@
 
 #include <QApplication>
 #include <QSize>
-#include "mainwindow.h"
+#include "framework/mainwindow.h"
 #include "gambattesource.h"
 #include "gambattemenuhandler.h"
 

diff --git a/gambatte_qt/src/src.pro b/gambatte_qt/src/src.pro
@@ -1,174 +1,17 @@
+COMMONPATH = ../../common
+include(framework/framework.pro)
+
 SOURCES += main.cpp \
-    videodialog.cpp \
-    blittercontainer.cpp \
-    inputdialog.cpp \
-    blitterwidgets/qglblitter.cpp \
-    blitterwidgets/qpainterblitter.cpp \
-    SDL_Joystick/src/SDL_event.cpp \
-    SDL_Joystick/src/SDL_error.c \
-    SDL_Joystick/src/SDL_joystick.c \
-    SDL_Joystick/src/SDL_string.c \
-    sounddialog.cpp \
-    audioengines/customdevconf.cpp \
-    palettedialog.cpp \
     gambattesource.cpp \
     gambattemenuhandler.cpp \
-    mainwindow.cpp \
-    blitterwidget.cpp
-SOURCES += ../../common/resample/chainresampler.cpp \
-	../../common/resample/u48div.cpp \
-	../../common/resample/resamplerinfo.cpp \
-	../../common/adaptivesleep.cpp \
-	../../common/rateest.cpp
-HEADERS += blitterwidget.h \
-    fullmodetoggler.h \
-    videodialog.h \
-    blittercontainer.h \
-    resinfo.h \
-    inputdialog.h \
-    audioengine.h \
-    addaudioengines.h \
-    addblitterwidgets.h \
-    getfullmodetoggler.h \
-    blitterwidgets/qglblitter.h \
-    blitterwidgets/qpainterblitter.h \
-    fullmodetogglers/nulltoggler.h \
-    SDL_Joystick/include/SDL_config.h \
-    SDL_Joystick/include/SDL_error.h \
-    SDL_Joystick/include/SDL_event.h \
-    SDL_Joystick/include/SDL_joystick.h \
-    SDL_Joystick/include/SDL_stdinc.h \
-    SDL_Joystick/src/SDL_error_c.h \
-    SDL_Joystick/src/SDL_joystick_c.h \
-    SDL_Joystick/src/SDL_sysjoystick.h \
-    sounddialog.h \
-    audioengines/nullaudioengine.h \
-    audioengines/customdevconf.h \
-    palettedialog.h \
-    mediasource.h \
-    gambattesource.h \
-    pixelbuffersetter.h \
+    palettedialog.cpp
+HEADERS += gambattesource.h \
     gambattemenuhandler.h \
-    mainwindow.h \
-    swscale.h \
-    rational.h
-HEADERS += ../../common/resample/blackmansinc.h \
-	../../common/resample/chainresampler.h \
-	../../common/resample/cic2.h \
-	../../common/resample/cic3.h \
-	../../common/resample/cic4.h \
-	../../common/resample/convoluter.h \
-	../../common/resample/hammingsinc.h \
-	../../common/resample/linint.h \
-	../../common/resample/makesinckernel.h \
-	../../common/resample/rectsinc.h \
-	../../common/resample/resampler.h \
-	../../common/resample/subresampler.h \
-	../../common/resample/u48div.h \
-	../../common/resample/upsampler.h \
-	../../common/resample/resamplerinfo.h \
-	../../common/adaptivesleep.h \
-	../../common/usec.h \
-	../../common/rateest.h
+    palettedialog.h
 TEMPLATE = app
 CONFIG += warn_on \
-    thread \
-    qt \
     release
-QT += opengl
-TARGET = ../bin/gambatte_qt
-INCLUDEPATH += ../../libgambatte/include \
-    SDL_Joystick/include \
-    ../../common
-LIBS += -L../../libgambatte \
-    -lgambatte
-DEFINES += HAVE_STDINT_H
-
-# QMAKE_CXXFLAGS = -g
-macx { 
-    SOURCES += addaudioengines_macx.cpp \
-        addblitterwidgets.cpp \
-        getfullmodetoggler_macx.cpp
-    SOURCES += SDL_Joystick/src/darwin/SDL_sysjoystick.c \
-        audioengines/openalengine.cpp \
-        fullmodetogglers/quartztoggler.cpp
-    HEADERS += audioengines/openalengine.h \
-        fullmodetogglers/quartztoggler.h
-    LIBS += -framework \
-        IOKit \
-        -framework \
-        OpenAL
-}
-else:unix { 
-    DEFINES += PLATFORM_UNIX
-    SOURCES += x11getprocaddress.cpp \
-        addblitterwidgets_unix.cpp \
-        getfullmodetoggler_unix.cpp \
-        audioengines/ossengine.cpp \
-        blitterwidgets/xvblitter.cpp \
-        blitterwidgets/x11blitter.cpp \
-        fullmodetogglers/xrandrtoggler.cpp #\
-#        fullmodetogglers/xf86vidmodetoggler.cpp
-    HEADERS += x11getprocaddress.h \
-        audioengines/ossengine.h \
-        blitterwidgets/xvblitter.h \
-        blitterwidgets/x11blitter.h \
-        fullmodetogglers/xrandrtoggler.h #\
-#        fullmodetogglers/xf86vidmodetoggler.h
-    LIBS += -L/usr/X11R6/lib \
-        -lXv \
-        -lXrandr #\
-#        -lXxf86vm \
-#        -lXinerama
-    linux-g++ { 
-        SOURCES += addaudioengines_linux.cpp \
-            audioengines/alsaengine.cpp \
-            SDL_Joystick/src/linux/SDL_sysjoystick.c
-        HEADERS += audioengines/alsaengine.h
-        LIBS += -lasound
-    }
-    else { 
-        SOURCES += addaudioengines_unix.cpp
-        freebsd-g++|netbsd-g++|openbsd-g++ { 
-            exists( /usr/include/usb.h ):DEFINES += HAVE_USB_H
-            exists( /usr/include/usbhid.h ):DEFINES += HAVE_USBHID_H
-            exists( /usr/include/libusb.h ):DEFINES += HAVE_LIBUSB_H
-            exists( /usr/include/libusbhid.h ):DEFINES += HAVE_LIBUSBHID_H
-            SOURCES += SDL_Joystick/src/bsd/SDL_sysjoystick.c
-        }
-        else:darwin-g++:SOURCES += SDL_Joystick/src/darwin/SDL_sysjoystick.c
-        else:SOURCES += SDL_Joystick/src/dummy/SDL_sysjoystick.c
-    }
-}
-else:win32 { 
-    DEFINES += PLATFORM_WIN32
-    SOURCES += gdisettings.cpp \
-        blitterwidgets/direct3dblitter.cpp \
-        getfullmodetoggler_win32.cpp \
-        addaudioengines_win32.cpp \
-        addblitterwidgets_win32.cpp \
-        audioengines/directsoundengine.cpp \
-        blitterwidgets/directdrawblitter.cpp \
-        fullmodetogglers/gditoggler.cpp \
-        SDL_Joystick/src/win32/SDL_mmjoystick.c
-    HEADERS += gdisettings.h \
-        blitterwidgets/direct3dblitter.h \
-        audioengines/directsoundengine.h \
-        blitterwidgets/directdrawblitter.h \
-        fullmodetogglers/gditoggler.h
-    LIBS += -lwinmm \
-        -lddraw \
-        -ldxguid \
-        -ldsound
-}
-else { 
-    SOURCES += addaudioengines.cpp \
-        addblitterwidgets.cpp \
-        getfullmodetoggler.cpp \
-        blitterwidget.cpp \
-        audioengines/aoengine.cpp
-    SOURCES += SDL_Joystick/src/dummy/SDL_sysjoystick.c
-    HEADERS += audioengines/aoengine.h
-    CONFIG += link_pkgconfig
-    PKGCONFIG += ao
-}
+TARGET = gambatte_qt
+DESTDIR = ../bin
+INCLUDEPATH += ../../libgambatte/include
+LIBS += -L../../libgambatte -lgambatte