Complete Qt5 support on Windows. http://i.imgur.com/uSIrRsp.png

Conflicts:
	Qt/Core.pro
	Qt/PPSSPP.pro
This commit is contained in:
Sacha 2013-10-20 05:34:33 +10:00 committed by Henrik Rydgard
parent 027ba31752
commit b0fa1a6835
2 changed files with 12 additions and 1 deletions

View file

@ -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

View file

@ -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 {