diff options
| author | Robert Bragg <robert.bragg@intel.com> | 2015-02-23 18:31:49 +0000 |
|---|---|---|
| committer | Robert Bragg <robert.bragg@intel.com> | 2015-02-23 18:39:34 +0000 |
| commit | da0d9757e7cfd74ec4674b558cb382421735f514 (patch) | |
| tree | 13335fde27d6f646df62cfce79f32468a0d8f5e0 | |
| parent | f82e9e2d22b48c79cf77b867f228a72556c721aa (diff) | |
Add version 1.2 define + macros
| -rw-r--r-- | cogl/cogl-macros.h | 14 | ||||
| -rw-r--r-- | cogl/cogl-version.h | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/cogl/cogl-macros.h b/cogl/cogl-macros.h index 17708f9e..96c06591 100644 --- a/cogl/cogl-macros.h +++ b/cogl/cogl-macros.h @@ -270,4 +270,18 @@ # define COGL_AVAILABLE_IN_1_18 #endif +#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_20 +# define COGL_DEPRECATED_IN_1_20 COGL_DEPRECATED +# define COGL_DEPRECATED_IN_1_20_FOR(f) COGL_DEPRECATED_FOR(f) +#else +# define COGL_DEPRECATED_IN_1_20 +# define COGL_DEPRECATED_IN_1_20_FOR(f) +#endif + +#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_20 +# define COGL_AVAILABLE_IN_1_20 COGL_UNAVAILABLE(1, 18) +#else +# define COGL_AVAILABLE_IN_1_20 +#endif + #endif /* __COGL_MACROS_H__ */ diff --git a/cogl/cogl-version.h b/cogl/cogl-version.h index 74301884..bc82437b 100644 --- a/cogl/cogl-version.h +++ b/cogl/cogl-version.h @@ -321,6 +321,16 @@ */ #define COGL_VERSION_1_18 (COGL_VERSION_ENCODE (1, 18, 0)) +/** + * COGL_VERSION_1_20: + * + * A macro that evaluates to the 1.20 version of Cogl, in a format + * that can be used by the C pre-processor. + * + * Since: 1.20 + */ +#define COGL_VERSION_1_20 (COGL_VERSION_ENCODE (1, 20, 0)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target */ |