Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

OSX build fixes for the Qt version

Browse Source
This commit is contained in:
Retem 2013-11-16 16:49:08 +01:00
parent 997f5090d7
commit 8c52ce3274
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Qt/PPSSPP.pro
View File

@ -30,6 +30,7 @@ LIBS += -lCore$${XT} -lCommon$${XT} -lNative$${XT}
# FFMPEG Path
win32: FFMPEG_DIR = ../ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
linux: FFMPEG_DIR = ../ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
macx|!mobile_platform: FFMPEG_DIR = ../ffmpeg/macosx/x86_64/lib/
qnx: FFMPEG_DIR = ../ffmpeg/blackberry/armv7/lib/
symbian:FFMPEG_DIR = -l

6
Qt/Settings.pri
View File

@ -52,6 +52,12 @@ contains(MEEGO_EDITION,harmattan) {
DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
}
macx:!mobile_platform {
INCLUDEPATH += ../ffmpeg/macosx/x86_64/include
#the qlist headers include <initializer_list> in QT5
greaterThan(QT_MAJOR_VERSION,4):CONFIG+=c++11
}
linux:!mobile_platform {
contains(QT_ARCH, x86_64): QMAKE_TARGET.arch = x86_64
else: QMAKE_TARGET.arch = x86

2
Qt/ctrldisasmview.cpp
View File

@ -8,6 +8,8 @@
#include <QInputDialog>
#include <QMessageBox>
#include "math.h"
#include "debugger_disasm.h"
#include "Core/Debugger/SymbolMap.h"

2
Qt/ctrlmemview.cpp
View File

@ -8,6 +8,8 @@
#include <QClipboard>
#include <QInputDialog>
#include "math.h"
#include "EmuThread.h"
#include "Core/MemMap.h"
#include "Core/Debugger/SymbolMap.h"