diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-12 20:52:42 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-12 20:52:42 +1000 |
| commit | 92b000291826ca78c30f205c104ac330484b82c9 (patch) | |
| tree | 35afef7fd58342c22e6de006f3ff23d5ec0b5d76 /src/gos/gos_rules.h | |
| parent | ddf79cd411e2cbdb58c485851b16be496109ab3b (diff) | |
| download | uGFX-92b000291826ca78c30f205c104ac330484b82c9.tar.gz uGFX-92b000291826ca78c30f205c104ac330484b82c9.tar.bz2 uGFX-92b000291826ca78c30f205c104ac330484b82c9.zip | |
First attempt at Keil CMSIS support
Diffstat (limited to 'src/gos/gos_rules.h')
| -rw-r--r-- | src/gos/gos_rules.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h index 6eea98c9..49d32b1d 100644 --- a/src/gos/gos_rules.h +++ b/src/gos/gos_rules.h @@ -16,7 +16,7 @@ #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 && !GFX_USE_OS_FREERTOS && !GFX_USE_OS_ECOS && !GFX_USE_OS_RAWRTOS && !GFX_USE_OS_ARDUINO +#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 && !GFX_USE_OS_ECOS && !GFX_USE_OS_RAWRTOS && !GFX_USE_OS_ARDUINO && !GFX_USE_OS_KEIL #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 @@ -24,7 +24,7 @@ #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 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO != 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 + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_KEIL != 1 * TRUE #error "GOS: More than one operation system has been defined as TRUE." #endif |