ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
samuncle 2015-03-26 00:47:08 +01:00
commit 2f5a2b0337
6 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -2,7 +2,7 @@
project(SuperTuxKart)
set(PROJECT_VERSION "0.8.1")
cmake_minimum_required(VERSION 2.8.1)
cmake_minimum_required(VERSION 2.8.4)
if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
cmake_policy(SET CMP0043 OLD)
endif()
@ -32,7 +32,7 @@ else()
set(WIIUSE_BUILD ON)
endif()
if(MINGW)
if(MINGW OR CYGWIN)
set(USE_WIIUSE OFF)
endif()

4
lib/irrlicht/CMakeLists.txt
View File

@ -35,6 +35,10 @@ if(UNIX AND USE_XRANDR)
add_definitions(-D_IRR_LINUX_X11_RANDR_)
endif()
if(CYGWIN)
add_definitions(-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
endif()
set(IRRLICHT_SOURCES
source/Irrlicht/CGUIListBox.cpp
source/Irrlicht/CZBuffer.cpp

2
lib/irrlicht/source/Irrlicht/COSOperator.cpp
View File

@ -11,7 +11,7 @@
#else
#include <string.h>
#include <unistd.h>
#ifndef _IRR_SOLARIS_PLATFORM_
#if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
#include <sys/types.h>
#include <sys/sysctl.h>
#endif

3
src/config/user_config.hpp
View File

@ -482,6 +482,9 @@ namespace UserConfigParams
PARAM_PREFIX BoolUserConfigParam m_esm
PARAM_DEFAULT(BoolUserConfigParam(false, "enable_esm",
&m_video_group, "Enable Exponential Shadow Map (better but slower)"));
PARAM_PREFIX BoolUserConfigParam m_old_driver_popup
PARAM_DEFAULT(BoolUserConfigParam(true, "old_driver_popup",
&m_video_group, "Determines if popup message about too old drivers should be displayed."));
// ---- Debug - not saved to config file
/** If gamepad debugging is enabled. */

31
src/main.cpp
View File

@ -1361,21 +1361,24 @@ int main(int argc, char *argv[] )
exit(0);
}
if (!ProfileWorld::isNoGraphics() && GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
if (UserConfigParams::m_old_driver_popup)
{
MessageDialog *dialog =
new MessageDialog(_("Your driver version is too old. Please install "
"the latest video drivers."),
/*from queue*/ true);
GUIEngine::DialogQueue::get()->pushDialog(dialog);
}
else if (!CVS->isGLSL())
{
MessageDialog *dialog =
new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
"if an update for your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."),
/*from queue*/ true);
GUIEngine::DialogQueue::get()->pushDialog(dialog);
if (!ProfileWorld::isNoGraphics() && GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
{
MessageDialog *dialog =
new MessageDialog(_("Your driver version is too old. Please install "
"the latest video drivers."),
/*from queue*/ true);
GUIEngine::DialogQueue::get()->pushDialog(dialog);
}
else if (!CVS->isGLSL())
{
MessageDialog *dialog =
new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
"if an update for your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."),
/*from queue*/ true);
GUIEngine::DialogQueue::get()->pushDialog(dialog);
}
}
// Note that on the very first run of STK internet status is set to

1
src/utils/translation.hpp
View File

@ -28,6 +28,7 @@
# define _(String, ...) (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String), ##__VA_ARGS__)))
#undef _C
#undef _P
# define _C(Ctx, String, ...) (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String, Ctx), ##__VA_ARGS__)))
# define _P(Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num), Num, ##__VA_ARGS__)))
# define _CP(Ctx, Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num, Ctx), Num, ##__VA_ARGS__)))