libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-24 00:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt for Blackberry. Remove unnecessary dependencies for Blackberry and Windows.

Browse Source
This commit is contained in:
Sacha 2013-03-20 08:17:22 +10:00
parent 85e10b6c39
commit 6673a938da
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Qt/PPSSPP.pro
View File

@ -10,14 +10,14 @@ include(Settings.pri)
# Libs
symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib
blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
qnx: LIBS += -L. -lCore -lCommon -lNative -lscreen -lz
win32 {
CONFIG(release, debug|release) {
LIBS += -L$$OUT_PWD/release
} else {
LIBS += -L$$OUT_PWD/debug
}
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32
}
linux: LIBS += -L. -lCore -lCommon -lNative

13
Qt/Settings.pri
View File

@ -1,5 +1,5 @@
DEFINES += USING_QT_UI
unix:!blackberry:!symbian:!macx: CONFIG += linux
unix:!qnx:!symbian:!macx: CONFIG += linux
# Global specific
DEFINES -= UNICODE
@ -35,15 +35,12 @@ gleslib = $$find(gleslib, "gles")
# Platform specific
contains(MEEGO_EDITION,harmattan): DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
blackberry: {
# They try to force QCC with all mkspecs
# QCC is 4.4.1, we need 4.6.3
QMAKE_CC = ntoarmv7-gcc
QMAKE_CXX = ntoarmv7-g++
qnx {
# Use mkspec: unsupported/qws/qnx-armv7-g++
DEFINES += BLACKBERRY BLACKBERRY10 "_QNX_SOURCE=1" "_C99=1"
}
symbian: {
# Does not seem to be a way to change to armv6 compile so just override in variants.xml (see README)
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"
QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment