thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL/Qt: Cleanup.

Browse source
This commit is contained in:
Sacha 2013-11-26 16:38:00 +10:00
parent 16b69fb583
commit 3bb995319b
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
base/PCMain.cpp
View file

@ -252,7 +252,15 @@ void LaunchEmail(const char *email_address)
std::string System_GetProperty(SystemProperty prop) { std::string System_GetProperty(SystemProperty prop) {
switch (prop) { switch (prop) {
case SYSPROP_NAME: case SYSPROP_NAME:
#ifdef _WIN32
return "SDL:Windows";
#elif __linux__
return "SDL:Linux";
#elif __APPLE__
return "SDL:OSX";
#else
return "SDL:"; return "SDL:";
#endif
case SYSPROP_LANGREGION: case SYSPROP_LANGREGION:
return "en_US"; return "en_US";
default: default:
@ -320,7 +328,6 @@ int main(int argc, char *argv[]) {
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
@ -357,7 +364,7 @@ int main(int argc, char *argv[]) {
EGL_Init(); EGL_Init();
#endif #endif
SDL_WM_SetCaption(app_name_nice.c_str(), NULL); SDL_WM_SetCaption((app_name_nice + " " + PPSSPP_GIT_VERSION).c_str(), NULL);
#ifdef MAEMO #ifdef MAEMO
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
#endif #endif

6
base/QtMain.cpp
View file

@ -34,7 +34,7 @@ std::string System_GetProperty(SystemProperty prop) {
#ifdef __SYMBIAN32__ #ifdef __SYMBIAN32__
return "Qt:Symbian"; return "Qt:Symbian";
#elif defined(BLACKBERRY) #elif defined(BLACKBERRY)
return "Qt:Blackberry10"; return "Qt:Blackberry";
#elif defined(MEEGO_EDITION_HARMATTAN) #elif defined(MEEGO_EDITION_HARMATTAN)
return "Qt:Meego"; return "Qt:Meego";
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
@ -120,11 +120,7 @@ int main(int argc, char *argv[])
#if defined(ARM) #if defined(ARM)
MainUI w; MainUI w;
w.resize(pixel_xres, pixel_yres); w.resize(pixel_xres, pixel_yres);
#ifdef ARM
w.showFullScreen(); w.showFullScreen();
#else
w.show();
#endif
#endif #endif
#ifdef __SYMBIAN32__ #ifdef __SYMBIAN32__
// Set RunFast hardware mode for VFPv2. // Set RunFast hardware mode for VFPv2.