Qt: Split GPU from Core to fix Debugger conflict.

Qt/Common.pro

@@ -1,4 +1,3 @@
-QT += opengl
 QT -= gui
 TARGET = Common
 TEMPLATE = lib

Qt/Core.pro

@@ -1,4 +1,3 @@
-QT += opengl
 QT -= gui
 TARGET = Core
 TEMPLATE = lib
@@ -6,7 +5,7 @@ CONFIG += staticlib
 
 include(Settings.pri)
 
-INCLUDEPATH += $$P/native $$P/Core/MIPS $$P/ $$P/ext/xbrz
+INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz
 
 arm {
 	SOURCES += $$P/Core/MIPS/ARM/*.cpp \ #CoreARM
@@ -18,18 +17,6 @@ else {
 	HEADERS += $$P/Core/MIPS/x86/*.h
 }
 
-win32 {
-	SOURCES += $$P/Windows/OpenGLBase.cpp
-	HEADERS += $$P/Windows/OpenGLBase.h
-
-	SOURCES += $$P/GPU/Directx9/helper/*.cpp
-	HEADERS += $$P/GPU/Directx9/helper/*.h
-
-	SOURCES += $$P/GPU/Directx9/*.cpp
-	HEADERS += $$P/GPU/Directx9/*.h
-	INCLUDEPATH += $$P/dx9sdk/Include
-}
-
 SOURCES += $$P/Core/*.cpp \ # Core
 	$$P/Core/Debugger/*.cpp \
 	$$P/Core/Dialog/*.cpp \
@@ -41,40 +28,7 @@ SOURCES += $$P/Core/*.cpp \ # Core
 	$$P/Core/MIPS/*.cpp \
 	$$P/Core/MIPS/JitCommon/*.cpp \
 	$$P/Core/Util/*.cpp \
-	$$P/GPU/GeDisasm.cpp \ # GPU
-	$$P/GPU/GPUCommon.cpp \
-	$$P/GPU/GPUState.cpp \
-	$$P/GPU/Math3D.cpp \
-	$$P/GPU/Null/NullGpu.cpp \
-	$$P/GPU/GLES/DepalettizeShader.cpp \
-	$$P/GPU/GLES/FragmentShaderGenerator.cpp \
-	$$P/GPU/GLES/Framebuffer.cpp \
-	$$P/GPU/GLES/GLES_GPU.cpp \
-	$$P/GPU/GLES/ShaderManager.cpp \
-	$$P/GPU/GLES/SoftwareTransform.cpp \
-	$$P/GPU/GLES/Spline.cpp \
-	$$P/GPU/GLES/StateMapping.cpp \
-	$$P/GPU/GLES/StencilBuffer.cpp \
-	$$P/GPU/GLES/TextureCache.cpp \
-	$$P/GPU/GLES/TextureScaler.cpp \
-	$$P/GPU/GLES/TransformPipeline.cpp \
-	$$P/GPU/GLES/VertexDecoder.cpp \
-	$$P/GPU/GLES/VertexShaderGenerator.cpp \
-	$$P/GPU/Software/*.cpp \
-	$$P/GPU/Debugger/*.cpp \
-	$$P/GPU/Common/IndexGenerator.cpp \
-	$$P/GPU/Common/TextureDecoder.cpp \
-	$$P/GPU/Common/VertexDecoderCommon.cpp \
-	$$P/GPU/Common/TransformCommon.cpp \
-	$$P/GPU/Common/PostShader.cpp \
-	$$P/ext/libkirk/*.c \ # Kirk
-	$$P/ext/xxhash.c \ # xxHash
-	$$P/ext/xbrz/*.cpp # XBRZ
-
-armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
-
-arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp
-else: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
+	$$P/ext/libkirk/*.c # Kirk
 
 HEADERS += $$P/Core/*.h \
 	$$P/Core/Debugger/*.h \
@@ -87,12 +41,6 @@ HEADERS += $$P/Core/*.h \
 	$$P/Core/MIPS/*.h \
 	$$P/Core/MIPS/JitCommon/*.h \
 	$$P/Core/Util/*.h \
-	$$P/GPU/GLES/*.h \
-	$$P/GPU/Software/*.h \
-	$$P/GPU/Debugger/*.h \
-	$$P/GPU/Common/*.h \
-	$$P/GPU/*.h \
-	$$P/ext/libkirk/*.h \
-	$$P/ext/xbrz/*.h
+	$$P/ext/libkirk/*.h
 
 win32: INCLUDEPATH += $$P/ffmpeg/WindowsInclude

Qt/GPU.pro

@@ -0,0 +1,62 @@
+QT += opengl
+QT -= gui
+TARGET = GPU
+TEMPLATE = lib
+CONFIG += staticlib
+
+include(Settings.pri)
+
+INCLUDEPATH += $$P/ $$P/native
+
+win32 {
+	SOURCES += $$P/Windows/OpenGLBase.cpp
+	HEADERS += $$P/Windows/OpenGLBase.h
+
+	SOURCES += $$P/GPU/Directx9/helper/*.cpp
+	HEADERS += $$P/GPU/Directx9/helper/*.h
+
+	SOURCES += $$P/GPU/Directx9/*.cpp
+	HEADERS += $$P/GPU/Directx9/*.h
+	INCLUDEPATH += $$P/dx9sdk/Include
+}
+
+SOURCES += 	$$P/GPU/GeDisasm.cpp \ # GPU
+	$$P/GPU/GPUCommon.cpp \
+	$$P/GPU/GPUState.cpp \
+	$$P/GPU/Math3D.cpp \
+	$$P/GPU/Null/NullGpu.cpp \
+	$$P/GPU/GLES/DepalettizeShader.cpp \
+	$$P/GPU/GLES/FragmentShaderGenerator.cpp \
+	$$P/GPU/GLES/Framebuffer.cpp \
+	$$P/GPU/GLES/GLES_GPU.cpp \
+	$$P/GPU/GLES/ShaderManager.cpp \
+	$$P/GPU/GLES/SoftwareTransform.cpp \
+	$$P/GPU/GLES/Spline.cpp \
+	$$P/GPU/GLES/StateMapping.cpp \
+	$$P/GPU/GLES/StencilBuffer.cpp \
+	$$P/GPU/GLES/TextureCache.cpp \
+	$$P/GPU/GLES/TextureScaler.cpp \
+	$$P/GPU/GLES/TransformPipeline.cpp \
+	$$P/GPU/GLES/VertexDecoder.cpp \
+	$$P/GPU/GLES/VertexShaderGenerator.cpp \
+	$$P/GPU/Software/*.cpp \
+	$$P/GPU/Debugger/*.cpp \
+	$$P/GPU/Common/IndexGenerator.cpp \
+	$$P/GPU/Common/TextureDecoder.cpp \
+	$$P/GPU/Common/VertexDecoderCommon.cpp \
+	$$P/GPU/Common/TransformCommon.cpp \
+	$$P/GPU/Common/PostShader.cpp \
+	$$P/ext/xxhash.c \ # xxHash
+	$$P/ext/xbrz/*.cpp # XBRZ
+
+armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
+
+arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp
+else: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
+
+HEADERS += 	$$P/GPU/GLES/*.h \
+	$$P/GPU/Software/*.h \
+	$$P/GPU/Debugger/*.h \
+	$$P/GPU/Common/*.h \
+	$$P/GPU/*.h \
+	$$P/ext/xbrz/*.h

Qt/PPSSPP.pro

@@ -31,8 +31,8 @@ greaterThan(QT_MAJOR_VERSION,4) {
 
 # PPSSPP Libs
 QMAKE_LIBDIR += $$CONFIG_DIR
-symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib
-else: LIBS += -lCore -lCommon -lNative
+symbian: LIBS += -lCore.lib -lGPU.lib -lCommon.lib -lNative.lib
+else: LIBS += -lCore -lGPU -lCommon -lNative
 
 # FFMPEG Path
 win32:	QMAKE_LIBDIR += $$P/ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
@@ -60,7 +60,7 @@ win32 {
 }
 
 macx|linux {
-	PRE_TARGETDEPS += $$CONFIG_DIR/libCommon.a $$CONFIG_DIR/libCore.a $$CONFIG_DIR/libNative.a
+	PRE_TARGETDEPS += $$CONFIG_DIR/libCommon.a $$CONFIG_DIR/libCore.a $$CONFIG_DIR/libGPU.a $$CONFIG_DIR/libNative.a
 	CONFIG += link_pkgconfig
 	packagesExist(sdl) {
 		DEFINES += QT_HAS_SDL

Qt/PPSSPPQt.pro

@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = Native.pro Core.pro Common.pro PPSSPP.pro
+SUBDIRS = Native.pro Core.pro GPU.pro Common.pro PPSSPP.pro
 CONFIG += ordered
-PPSSPP.depends = Native.pro Core.pro Common.pro
+PPSSPP.depends = Native.pro GPU.pro Core.pro Common.pro