libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-21 09:21:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sailfish: More compatibility with SailFish OS. It also needs stddef where Maemo does.

Browse Source 
Set packaging by default for iOS with b.sh.
This commit is contained in:
Sacha 2014-07-24 23:20:09 +10:00
parent 50fec0e741
commit 6ce3765b12
8 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Log.h
View File

@ -31,10 +31,6 @@
#define VERBOSE_LEVEL 6 // Noisy debugging - sometimes needed but usually unimportant.
#if !defined(_WIN32)
#if defined(MAEMO)
//ucontext.h will be then skipped
#define _SYS_UCONTEXT_H 1
#endif
#include <signal.h>
#endif

2
Core/MIPS/ARM/ArmJit.h
View File

@ -23,7 +23,7 @@
#include "Core/MIPS/ARM/ArmRegCacheFPU.h"
#include "Core/MIPS/ARM/ArmAsm.h"
#if defined(MAEMO)
#ifndef offsetof
#include "stddef.h"
#endif

2
Core/MIPS/ARM/ArmRegCache.cpp
View File

@ -22,7 +22,7 @@
#include "Core/Reporting.h"
#include "Common/ArmEmitter.h"
#if defined(MAEMO)
#ifndef offsetof
#include "stddef.h"
#endif

3
Core/MemMap.h
View File

@ -20,7 +20,8 @@
#include <cstring>
#ifdef __SYMBIAN32__
#include <e32std.h>
#elif defined(MAEMO)
#endif
#ifndef offsetof
#include <stddef.h>
#endif

8
Qt/PPSSPP.pro
View File

@ -97,11 +97,9 @@ else {
# Grab all possible directories (win32/unix)
win32: PATHS = $$split($$(PATH), ;)
else: PATHS = $$split($$(PATH), :)
greaterThan(QT_MAJOR_VERSION, 4) {
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
} else {
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt4): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt4
}
# Either -qt4 or -qt5 will work.
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt4): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt4
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
# Translations
TRANSLATIONS = $$files($$P/Qt/languages/ppsspp_*.ts)

2
Qt/Platform/maemo.pri
View File

@ -1,5 +1,5 @@
DEFINES += MAEMO __GL_EXPORTS
contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
DEFINES += "_SYS_UCONTEXT_H=1"
!contains(CONFIG, staticlib) {
# Packaging

4
Qt/Settings.pri
View File

@ -1,5 +1,6 @@
VERSION = 0.9.9
DEFINES += USING_QT_UI USE_FFMPEG
# Global specific
win32:CONFIG(release, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/release)
else:win32:CONFIG(debug, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/debug)
@ -8,7 +9,8 @@ OBJECTS_DIR = $$CONFIG_DIR/.obj/$$TARGET
MOC_DIR = $$CONFIG_DIR/.moc/$$TARGET
UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
RCC_DIR = $$CONFIG_DIR/.rcc/$$TARGET
QMAKE_CLEAN += -r $$CONFIG_DIR/.obj $$CONFIG_DIR/.ui $$CONFIG_DIR/.moc $$CONFIG_DIR/.rcc $$TARGET
QMAKE_CLEAN += -r $$OBJECTS_DIR $$MOC_DIR $$UI_DIR $$RCC_DIR
P = $$_PRO_FILE_PWD_/..
INCLUDEPATH += $$P/ext/zlib $$P/Common

4
b.sh
View File

@ -27,9 +27,11 @@ do
;;
--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=ios/ios.toolchain.cmake -GXcode ${CMAKE_ARGS}"
TARGET_OS=iOS
PACKAGE=1
;;
--android) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=android/android.toolchain.cmake ${CMAKE_ARGS}"
TARGET_OS="Android"
TARGET_OS=Android
PACKAGE=1
;;
--simulator) echo "Simulator mode enabled"
CMAKE_ARGS="-DSIMULATOR=ON ${CMAKE_ARGS}"