libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-04 14:37:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Buildfix for Qt on Windows. Rearrange parts of the Qt project file.

Browse Source
This commit is contained in:
Sacha 2013-10-19 04:02:47 +10:00
parent 51196742ee
commit f8e386995f
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Qt/Settings.pri
View File

@ -1,15 +1,15 @@
DEFINES += USING_QT_UI
DEFINES += USING_QT_UI USE_FFMPEG
unix:!qnx:!symbian:!macx: CONFIG += linux
# Global specific
DEFINES -= UNICODE
INCLUDEPATH += ../ext/zlib ../native/ext/glew ../Common
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O3 /arch:SSE2 /fp:fast
DEFINES += _MBCS GLEW_STATIC NOMINMAX NODRAWTEXT _CRT_SECURE_NO_WARNINGS
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
DEFINES += _MBCS GLEW_STATIC _CRT_SECURE_NO_WARNINGS
PRECOMPILED_HEADER = ../Windows/stdafx.h
PRECOMPILED_SOURCE = ../Windows/stdafx.cpp
INCLUDEPATH += .. ../ffmpeg/Windows/$${QMAKE_TARGET.arch}/include
} else {
QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
QMAKE_CXXFLAGS += -std=c++0x -ffast-math -fno-strict-aliasing
@ -38,10 +38,15 @@ contains(MEEGO_EDITION,harmattan)|!count(gleslib,0) {
}
# Platform specific
contains(MEEGO_EDITION,harmattan): DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
contains(MEEGO_EDITION,harmattan): {
# Does not yet support FFMPEG
DEFINES -= USE_FFMPEG
DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
}
linux:!mobile_platform: {
DEFINES += USE_FFMPEG
INCLUDEPATH += ../ffmpeg/linux/x86_64/include
DEFINES += __STDC_CONSTANT_MACROS
INCLUDEPATH += ../ffmpeg/linux/$${QMAKE_HOST.arch}/include
}
qnx {
# Use mkspec: unsupported/qws/qnx-armv7-g++
@ -51,7 +56,7 @@ symbian {
# Does not seem to be a way to change to armv6 compile so just override in variants.xml (see README)
MMP_RULES -= "ARMFPU softvfp+vfpv2"
MMP_RULES += "ARMFPU vfpv2"
DEFINES += USE_FFMPEG __STDC_CONSTANT_MACROS
DEFINES += __STDC_CONSTANT_MACROS
#"BOOST_COMPILER_CONFIG=<boost/mpl/aux_/config/gcc.hpp>"
QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment
INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis $$EPOCROOT/epoc32/include/stdapis/glib-2.0

2
native

@ -1 +1 @@
Subproject commit 3b8f098e7a2df3b57e5e0efb9d9b410040edad15
Subproject commit 6b48226f898382cebf89901977940a980502a119