Merge tag '1.11.0-RC1' into master

src/table/misc_settings.ini

@@ -12,6 +12,9 @@ static const char *_support8bppmodes = "no|system|hardware";
 #ifdef WITH_COCOA
 extern bool _allow_hidpi_window;
 #endif
+#ifndef WITH_COCOA
+#define WITHOUT_COCOA
+#endif
 
 static const SettingDescGlobVarList _misc_settings[] = {
 [post-amble]
@@ -26,6 +29,10 @@ SDTG_BOOL  =  SDTG_BOOL($name,                 $flags, $guiflags, $var, $def,
 SDTG_VAR   =   SDTG_VAR($name, $type,          $flags, $guiflags, $var, $def, $min, $max, $interval,        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup),
 SDTG_END   = SDTG_END()
 
+[validation]
+SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
+SDTG_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
+
 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NONE
@@ -56,6 +63,20 @@ var      = _fullscreen
 def      = false
 cat      = SC_BASIC
 
+[SDTG_BOOL]
+ifdef    = WITH_COCOA
+name     = ""video_hw_accel""
+var      = _video_hw_accel
+def      = false
+cat      = SC_BASIC
+
+[SDTG_BOOL]
+ifdef    = WITHOUT_COCOA
+name     = ""video_hw_accel""
+var      = _video_hw_accel
+def      = true
+cat      = SC_BASIC
+
 [SDTG_OMANY]
 name     = ""support8bpp""
 type     = SLE_UINT8