diff --git a/hyper.h b/hyper.h index 7e542ec9..53f55bbe 100644 --- a/hyper.h +++ b/hyper.h @@ -11,6 +11,11 @@ namespace hr { +struct always_false { + operator bool() const { return false; }; + void operator = (bool b) const {}; + }; + template void ignore(T&&) { // placate GCC's overzealous -Wunused-result @@ -2273,6 +2278,10 @@ namespace tour { extern hookset *hooks_slide; }; +#else +namespace tour { + static const always_false on; + } #endif extern bool doCross; diff --git a/sysconfig.h b/sysconfig.h index 8e2f6620..5b81158f 100644 --- a/sysconfig.h +++ b/sysconfig.h @@ -77,15 +77,15 @@ #endif #ifndef CAP_ANIMATIONS -#define CAP_ANIMATIONS (!CAP_MINI) +#define CAP_ANIMATIONS (!ISMINI) #endif #ifndef CAP_FILES -#define CAP_FILES 1 +#define CAP_FILES (!ISMINI) #endif #ifndef CAP_INV -#define CAP_INV 1 +#define CAP_INV (!ISMINI) #endif #ifndef CAP_ANDROIDSHARE @@ -197,7 +197,7 @@ #define CAP_SDLAUDIO (CAP_SDL && CAP_AUDIO) #ifndef CAP_SVG -#define CAP_SVG (!ISMOBILE) +#define CAP_SVG (CAP_FILES && !ISMOBILE && !ISMINI) #endif #ifndef CAP_POLY