summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-06 20:31:46 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-06 20:31:46 +0300
commit6cd4c1a2b02726766ad0d5317013ba2e1314c127 (patch)
tree8d03d304c7c45fc3125c7715ff3b1b71f4335e87
parent23d29ec55093cd95c9084965a179ef70da2af150 (diff)
downloadmv-6cd4c1a2b02726766ad0d5317013ba2e1314c127.tar.gz
mv-6cd4c1a2b02726766ad0d5317013ba2e1314c127.tar.bz2
mv-6cd4c1a2b02726766ad0d5317013ba2e1314c127.tar.xz
mv-6cd4c1a2b02726766ad0d5317013ba2e1314c127.zip
Disable best video mode detection under Apple.
-rw-r--r--src/client.cpp2
-rw-r--r--src/gui/setup_video.cpp6
-rw-r--r--src/gui/setup_video.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp
index c1fde21d2..1fd3793f1 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -535,7 +535,7 @@ void Client::gameInit()
}
#endif
-#if defined(USE_OPENGL) && !defined(ANDROID)
+#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
if (!mOptions.safeMode && mOptions.test.empty()
&& !config.getBoolValue("videodetected"))
{
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 37e09645c..bc6245ebc 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -235,7 +235,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
mFpsLabel(new Label(this)),
mAltFpsSlider(new Slider(2, 160)),
mAltFpsLabel(new Label(this, _("Alt FPS limit: "))),
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(__APPLE__)
mDetectButton(new Button(this, _("Detect best mode"), "detect", this)),
#endif
mDialog(nullptr)
@@ -317,7 +317,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
place(0, 7, mAltFpsSlider);
place(1, 7, mAltFpsLabel).setPadding(3);
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(__APPLE__)
place(0, 8, mDetectButton);
#else
mNoFrameCheckBox->setEnabled(false);
@@ -571,7 +571,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
{
config.setValue("noframe", mNoFrameCheckBox->isSelected());
}
-#if defined(USE_OPENGL) && !defined(ANDROID)
+#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
else if (id == "detect")
{
TestMain *test = graphicsManager.startDetection();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 59c293945..6d6e8cdcb 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -87,7 +87,7 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
Slider *mAltFpsSlider;
Label *mAltFpsLabel;
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(__APPLE__)
Button *mDetectButton;
#endif
TextDialog *mDialog;