diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-10 18:58:40 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-10 18:58:40 +0200 |
| commit | e5b8e351f5050da7f99fe6fb7882edfc778799f2 (patch) | |
| tree | 25e2e47702837c4745ff503d1ffb537059eb9f0c /src/gos/sys_rules.h | |
| parent | 2632bb1ed5a3e362ad440d7a1a663911ce2bbcae (diff) | |
| parent | 33a037b81c5d974d1cf419ecc87e91a74b8c9406 (diff) | |
| download | uGFX-e5b8e351f5050da7f99fe6fb7882edfc778799f2.tar.gz uGFX-e5b8e351f5050da7f99fe6fb7882edfc778799f2.tar.bz2 uGFX-e5b8e351f5050da7f99fe6fb7882edfc778799f2.zip | |
Merge branch 'freertos'
Diffstat (limited to 'src/gos/sys_rules.h')
| -rw-r--r-- | src/gos/sys_rules.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gos/sys_rules.h b/src/gos/sys_rules.h index 390e8116..f23d330b 100644 --- a/src/gos/sys_rules.h +++ b/src/gos/sys_rules.h @@ -16,16 +16,21 @@ #ifndef _GOS_RULES_H #define _GOS_RULES_H -#if !GFX_USE_OS_CHIBIOS && !GFX_USE_OS_WIN32 && !GFX_USE_OS_LINUX && !GFX_USE_OS_OSX && !GFX_USE_OS_RAW32 +#if !GFX_USE_OS_CHIBIOS && !GFX_USE_OS_WIN32 && !GFX_USE_OS_LINUX && !GFX_USE_OS_OSX && !GFX_USE_OS_RAW32 && !GFX_USE_OS_FREERTOS #if GFX_DISPLAY_RULE_WARNINGS #warning "GOS: No Operating System has been defined. ChibiOS (GFX_USE_OS_CHIBIOS) has been turned on for you." #endif #undef GFX_USE_OS_CHIBIOS #define GFX_USE_OS_CHIBIOS TRUE #endif -#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 != 1 * TRUE + +#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS != 1 * TRUE #error "GOS: More than one operation system has been defined as TRUE." #endif +#if GFX_FREERTOS_USE_TRACE && !GFX_USE_OS_FREERTOS + #error "GOS: GFX_FREERTOS_USE_TRACE is only available for the FreeRTOS port." +#endif + #endif /* _GOS_RULES_H */ /** @} */ |