libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-23 16:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some unnecessary #ifdef's relating to Symbian.

Browse Source
This commit is contained in:
Sacha 2014-06-10 23:06:00 +10:00
parent adee76cd62
commit 37b7667038
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/HLE/sceMpeg.cpp
View File

@ -785,10 +785,10 @@ bool InitPmp(MpegContext * ctx){
// initialize ctx->mediaengine->m_pFrame and ctx->mediaengine->m_pFrameRGB
if (!mediaengine->m_pFrame){
mediaengine->m_pFrame = avcodec_alloc_frame();
mediaengine->m_pFrame = av_frame_alloc();
}
if (!mediaengine->m_pFrameRGB){
mediaengine->m_pFrameRGB = avcodec_alloc_frame();
mediaengine->m_pFrameRGB = av_frame_alloc();
}
// get RGBA picture buffer

8
Qt/Native.pro
View File

@ -54,9 +54,11 @@ win32|contains(QT_CONFIG, no-zlib) {
HEADERS += $$P/ext/zlib/*.h
}
# Libzip
SOURCES += $$P/native/ext/libzip/*.c
HEADERS += $$P/native/ext/libzip/*.h
!symbian {
# Libzip
SOURCES += $$P/native/ext/libzip/*.c
HEADERS += $$P/native/ext/libzip/*.h
}
# Libpng
SOURCES += $$P/native/ext/libpng17/*.c

2
UI/MainScreen.cpp
View File

@ -777,9 +777,7 @@ void MainScreen::CreateViews() {
#endif
rightColumnItems->Add(new Choice(m->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings);
rightColumnItems->Add(new Choice(m->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits);
#ifndef __SYMBIAN32__
rightColumnItems->Add(new Choice(m->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
#endif
#ifndef GOLD
Choice *gold = rightColumnItems->Add(new Choice(m->T("Support PPSSPP")));
gold->OnClick.Handle(this, &MainScreen::OnSupport);

2
native

@ -1 +1 @@
Subproject commit dd03687400d18fb8b2747ba22901bb525cac5ff7
Subproject commit f7ffcd41973a1106a6866186a0d65f41e6e97b3c