From b0fa1a6835f7eee1001916e32c64b056b418a6cd Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 20 Oct 2013 05:34:33 +1000 Subject: [PATCH] Complete Qt5 support on Windows. http://i.imgur.com/uSIrRsp.png Conflicts: Qt/Core.pro Qt/PPSSPP.pro --- Qt/Core.pro | 6 ++++++ Qt/PPSSPP.pro | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Qt/Core.pro b/Qt/Core.pro index 6cc7dd6c2b..1a99e35cf9 100755 --- a/Qt/Core.pro +++ b/Qt/Core.pro @@ -30,6 +30,12 @@ x86 { win32 { SOURCES += ../Windows/OpenGLBase.cpp HEADERS += ../Windows/OpenGLBase.h + + SOURCES += ../GPU/Directx9/helper/*.cpp + HEADERS += ../GPU/Directx9/helper/*.h + SOURCES += ../GPU/Directx9/*.cpp + HEADERS += ../GPU/Directx9/*.h + INCLUDEPATH += ../dx9sdk/Include } SOURCES += ../Core/*.cpp \ # Core diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 3a25fa94f9..7f02b0822a 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -28,7 +28,12 @@ win32 { LIBS += -L$$OUT_PWD/debug } FFMPEG_DIR = ../ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/ - LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 + LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 -lShell32 -lAdvapi32 + contains($$QMAKE_TARGET.arch, x86_64) { + LIBS += $$files(../dx9sdk/Lib/x64/*.lib) + } else { + LIBS += $$files(../dx9sdk/Lib/x86/*.lib) + } LIBS += $${FFMPEG_DIR}avformat.lib $${FFMPEG_DIR}avcodec.lib $${FFMPEG_DIR}avutil.lib $${FFMPEG_DIR}swresample.lib $${FFMPEG_DIR}swscale.lib } linux {