mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-24 00:29:57 +00:00
Build fix for Harmattan/N9
This commit is contained in:
parent
182b95f187
commit
97221ad2a5
@ -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
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
2
native
2
native
@ -1 +1 @@
|
||||
Subproject commit 9c96dcea91f6d4237e878c9d1b004e3e1e9678d7
|
||||
Subproject commit bd7bee5a11cd01ebf9f2e8445db7fedab7e3b295
|
Loading…
Reference in New Issue
Block a user