From 8d7ec80e93a6300c0609f7793ecdfc275e62ff44 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 23 Dec 2012 20:26:18 +1000 Subject: [PATCH] Fix Qt compile for ARM processors. Update README for Qt frontend. --- Qt/Settings.pri | 10 +++++----- README.md | 30 ++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Qt/Settings.pri b/Qt/Settings.pri index 320a37ca3..5db0598e9 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -5,14 +5,14 @@ unix:!blackberry:!macx: CONFIG += linux QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter # Arch specific -contains(QT_ARCH, arm): { - DEFINES += ARM - CONFIG += arm -} -contains(QT_ARCH, x86)|contains(QT_ARCH, x86_64): { +contains(QT_ARCH, i686)|contains(QT_ARCH, x86)|contains(QT_ARCH, x86_64): { QMAKE_CXXFLAGS += -msse2 CONFIG += x86 } +else { # Assume ARM + DEFINES += ARM + CONFIG += arm +} mobile_platform: DEFINES += USING_GLES2 diff --git a/README.md b/README.md index 40b454448..1d94abdab 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,9 @@ Of course in-tree builds are supported, but that makes cleanup harder to do; with out-of-tree builds you can just remove the `build` directory. +Note: There is also a Qt frontend available. Simply compile +PPSSPPQt.pro from [QtCreator][qt-creator]. + Building for Linux/BSD/etc -------------------------- @@ -51,7 +54,9 @@ Install the libsdl1.2 (SDL 1.2) development headers. This is called `sdl12` on BSD ports. Currently the user interface is identical to Android's, operated -with the mouse. A Qt-based interface is planned. +with the mouse. + +Alternatively, a Qt-based frontend is available in the Qt/ dir. Building for OSX ---------------- @@ -92,10 +97,7 @@ other than Microsoft's, but `NMake Makefiles` works fine. Building for Blackberry ----------------------- -To build for Blackberry, you must first have the latest Native SDK installed -from developer.blackberry.com/native and have compiled the SDL port available -from github.com/blackberry/SDL to your NDK workspace. Then checkout the latest -version of PPSSPP to your NDK workspace. +To build for Blackberry, you must first have the [latest Native SDK][blackberry-ndk] installed. To set up your environment for cross-compiling you must then use: source ~/bbndk/bbndk-env.sh @@ -105,20 +107,28 @@ Finally, you are ready to compile. Change directory to ppsspp/SDL and run: If you are on Windows, you will need GNU and CMake to run the bash script. -Alternatively, you can use the Qt UI by compiling the PPSSPPQt.pro in the Qt/ -directory with qmake from the NDK or QtCreator 2.6+. +Alternatively, you can use the Qt frontend by compiling the PPSSPPQt.pro in +the Qt/ directory with `qmake` from the NDK or [QtCreator 2.6+][qt-creator]. Building for Symbian -------------------- To build for Symbian, you require: -1) GCC 4.6.3 from Mentor Graphics: http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/ -2) Symbian Qt libraries. You can find these in the final Nokia Qt SDK. -Then simply compile the PPSSPPQt.pro with qmake from the SDK or QtCreator 2.6+. +1) [GCC 4.6.3][symbian-gcc] from Mentor Graphics. + +2) Symbian Qt libraries. You can find these in the final Nokia Qt SDK or online. + +Then simply compile the PPSSPPQt.pro with `qmake` from the SDK or [QtCreator 2.6+][qt-creator]. [ppsspp-repo]: "https://github.com/hrydgard/ppsspp" [ppsspp-devel]: "http://www.ppsspp.org/development.html" +[qt-creator]: + "http://qt-project.org/downloads" +[blackberry-ndk]: + "http://developer.blackberry.com/native" +[symbian-gcc]: + "http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/"