ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a OSX version check to GLSL so if anyone running < OSX 10.7 gets a message instead of crashing when running the game. Turn off DEBUG_GLSL.

This commit is contained in:
Ryan Houdek 2013-03-14 15:25:41 -05:00
parent e63a5d8529
commit db1fc9019b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -50,6 +50,10 @@
#include <shellapi.h> #include <shellapi.h>
#endif #endif
#ifdef __APPLE__
#include <CarbonCore/OSUtils.h>
#endif
// Nvidia drivers >= v302 will check if the application exports a global // Nvidia drivers >= v302 will check if the application exports a global
// variable named NvOptimusEnablement to know if it should run the app in high // variable named NvOptimusEnablement to know if it should run the app in high
// performance graphics mode or using the IGP. // performance graphics mode or using the IGP.
@ -212,6 +216,19 @@ bool DolphinApp::OnInit()
return false; return false;
} }
#endif #endif
#ifdef __APPLE__
SInt32 versMaj, versMin;
Gestalt(gestaltSystemVersionMajor, &versMaj);
Gestalt(gestaltSystemVersionMinor, &versMin);
if (!(versMaj >= 10 && versMin >= 7))
{
PanicAlertT("Hi,\n\nDolphin requires OS X 10.7 or greater.\n"
"Unfortunately you're running an old version of OS X.\n"
"Please upgrade to 10.7 or greater to use Dolphin.\n\n"
"Sayonara!\n");
return false;
}
#endif
#ifdef _WIN32 #ifdef _WIN32
if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory()))) if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory())))

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -70,7 +70,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#endif #endif
// this should be removed in future, but as long as glsl is unstable, we should really read this messages // this should be removed in future, but as long as glsl is unstable, we should really read this messages
#if defined(_DEBUG) || defined(DEBUGFAST) || 1 #if defined(_DEBUG) || defined(DEBUGFAST)
#define DEBUG_GLSL 1 #define DEBUG_GLSL 1
#else #else
#define DEBUG_GLSL 0 #define DEBUG_GLSL 0