From 75a80fdfdce4be53ce7d7b1d02400d3f79a144c0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 26 Oct 2012 13:33:20 +0300 Subject: Android compilation fixes. --- src/gui/setup_video.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/gui/setup_video.cpp') diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 9eaf5be56..688519743 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -253,15 +253,20 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mOpenGLListModel = new OpenGLListModel; - mOpenGLDropDown = new DropDown(widget, mOpenGLListModel), - mOpenGLDropDown->setSelected(mOpenGLEnabled); - - mModeList->setEnabled(true); + mOpenGLDropDown = new DropDown(widget, mOpenGLListModel); -#ifndef USE_OPENGL +#ifdef USE_OPENGL +#ifdef ANDROID + if (mOpenGLEnabled == 1 || mOpenGLEnabled == 2) + mOpenGLEnabled = 3; +#endif + mOpenGLDropDown->setSelected(mOpenGLEnabled); +#else mOpenGLDropDown->setSelected(0); #endif + mModeList->setEnabled(true); + mFpsLabel->setCaption(mFps > 0 ? toString(mFps) : _("None")); mFpsLabel->setWidth(60); mAltFpsLabel->setCaption(_("Alt FPS limit: ") + (mAltFps > 0 -- cgit v1.2.3-60-g2f50