Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove 'BLACKBERRY10' define as it is now the minimum OS requirement.

Browse Source
This commit is contained in:
Sacha 2013-06-21 15:40:52 +10:00
parent 5f01acd03b
commit 2570268393
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -108,9 +108,6 @@ include_directories("${CMAKE_SOURCE_DIR}")
if(BLACKBERRY)
add_definitions(-DBLACKBERRY)
if(BLACKBERRY VERSION_GREATER 10)
add_definitions(-DBLACKBERRY10)
endif()
endif()
if(ANDROID)

6
Core/Config.cpp
View File

@ -108,7 +108,7 @@ void Config::Load(const char *iniFileName)
#endif
graphics->Get("VertexCache", &bVertexCache, true);
graphics->Get("FullScreen", &bFullScreen, false);
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
graphics->Get("PartialStretch", &bPartialStretch, pixel_xres == pixel_yres);
#endif
graphics->Get("StretchToDisplay", &bStretchToDisplay, false);
@ -125,7 +125,7 @@ void Config::Load(const char *iniFileName)
IniFile::Section *control = iniFile.GetOrCreateSection("Control");
control->Get("ShowStick", &bShowAnalogStick, false);
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
control->Get("ShowTouchControls", &bShowTouchControls, pixel_xres != pixel_yres);
#elif defined(USING_GLES2)
control->Get("ShowTouchControls", &bShowTouchControls, true);
@ -209,7 +209,7 @@ void Config::Save()
graphics->Set("AnisotropyLevel", iAnisotropyLevel);
graphics->Set("VertexCache", bVertexCache);
graphics->Set("FullScreen", bFullScreen);
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
graphics->Set("PartialStretch", bPartialStretch);
#endif
graphics->Set("StretchToDisplay", bStretchToDisplay);

2
Core/Config.h
View File

@ -63,7 +63,7 @@ public:
bool bBufferedRendering;
bool bLinearFiltering;
bool bUseVBO;
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
bool bPartialStretch;
#endif
bool bStretchToDisplay;

2
GPU/GLES/Framebuffer.cpp
View File

@ -88,7 +88,7 @@ void CenterRect(float *x, float *y, float *w, float *h,
*x = 0.0f;
*w = frameW;
*h = frameW / origRatio;
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
// Stretch a little bit
if (g_Config.bPartialStretch)
*h = (frameH + *h) / 2.0f; // (408 + 720) / 2 = 564

2
Qt/Settings.pri
View File

@ -37,7 +37,7 @@ contains(MEEGO_EDITION,harmattan)|!count(gleslib,0) {
contains(MEEGO_EDITION,harmattan): DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
qnx {
# Use mkspec: unsupported/qws/qnx-armv7-g++
DEFINES += BLACKBERRY BLACKBERRY10 "_QNX_SOURCE=1" "_C99=1"
DEFINES += BLACKBERRY "_QNX_SOURCE=1" "_C99=1"
}
symbian {
# Does not seem to be a way to change to armv6 compile so just override in variants.xml (see README)

2
UI/MenuScreens.cpp
View File

@ -454,7 +454,7 @@ void PauseScreen::render() {
UICheckBox(GEN_ID, x, y += stride, a->T("Enable Sound"), ALIGN_TOPLEFT, &g_Config.bEnableSound);
// TODO: Maybe shouldn't show this if the screen ratios are very close...
#ifdef BLACKBERRY10
#ifdef BLACKBERRY
if (pixel_xres == pixel_yres)
UICheckBox(GEN_ID, x, y += stride, gs->T("Partial Vertical Stretch"), ALIGN_TOPLEFT, &g_Config.bPartialStretch);
#endif