From 97221ad2a5b4acf80fe55b4750d285b749e2b7e5 Mon Sep 17 00:00:00 2001 From: Sacha Date: Fri, 12 Apr 2013 00:22:16 +1000 Subject: [PATCH] Build fix for Harmattan/N9 --- Qt/PPSSPP.pro | 25 +++++++++++++++++-------- Qt/Settings.pri | 2 +- native | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 108b83ee22..1b5f49bc2d 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -16,17 +16,18 @@ win32 { LIBS += -L$$OUT_PWD/release } else { LIBS += -L$$OUT_PWD/debug - } + } LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 } -linux: LIBS += -L. -lCore -lCommon -lNative - -linux:!mobile_platform { +linux { + LIBS += -L. -lCore -lCommon -lNative PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a - CONFIG += link_pkgconfig - packagesExist(sdl) { - DEFINES += QT_HAS_SDL - PKGCONFIG += sdl + !mobile_platform { + CONFIG += link_pkgconfig + packagesExist(sdl) { + DEFINES += QT_HAS_SDL + PKGCONFIG += sdl + } } } @@ -82,3 +83,11 @@ symbian { TARGET.EPOCHEAPSIZE = 0x40000 0x10000000 TARGET.EPOCSTACKSIZE = 0x10000 } + +contains(MEEGO_EDITION,harmattan) { + target.path = /opt/PPSSPP/bin + assets.sources = ../assets/flash + assets.path = /opt/PPSSPP/flash + INSTALLS += target assets +} + diff --git a/Qt/Settings.pri b/Qt/Settings.pri index 04716c8f01..d9a89a3eaf 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -28,7 +28,7 @@ else { # Assume ARM gleslib = $$lower($$QMAKE_LIBS_OPENGL) gleslib = $$find(gleslib, "gles") -!count(gleslib,0) { +contains(MEEGO_EDITION,harmattan)|!count(gleslib,0) { DEFINES += USING_GLES2 CONFIG += mobile_platform } diff --git a/native b/native index 9c96dcea91..bd7bee5a11 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 9c96dcea91f6d4237e878c9d1b004e3e1e9678d7 +Subproject commit bd7bee5a11cd01ebf9f2e8445db7fedab7e3b295