Browse Source

Fix compiler detection for Keil uVision V5

remotes/origin_old/ugfx_release_2.6
inmarket 6 years ago
parent
commit
849369ccec
  1. 4
      gfx.h
  2. 4
      src/gos/gos_x_threads.c
  3. 2
      src/gwin/gwin_class.h

4
gfx.h

@ -286,7 +286,7 @@
#define GFX_COMPILER GFX_COMPILER_MINGW64
#elif defined(__CYGWIN__)
#define GFX_COMPILER GFX_COMPILER_CYGWIN
#elif defined(__KEIL__) || defined(__C51__)
#elif defined(__KEIL__) || defined(__C51__) || (defined(__CC_ARM) && defined(__EDG__))
#define GFX_COMPILER GFX_COMPILER_KEIL
#elif defined(__clang__)
#define GFX_COMPILER GFX_COMPILER_CLANG
@ -392,7 +392,7 @@
#if GFX_NO_INLINE
#define GFXINLINE
#else
#if defined(__KEIL__) || defined(__C51__)
#if GFX_COMPILER == GFX_COMILER_KEIL
#define GFXINLINE __inline
#else
#define GFXINLINE inline

4
src/gos/gos_x_threads.c

@ -203,12 +203,12 @@ static thread mainthread; // The main thread context
* If they don't exist compile them to be the standard setjmp() function.
* Similarly for longjmp().
*/
#if (!defined(setjmp) && !defined(_setjmp)) || defined(__KEIL__) || defined(__C51__)
#if (!defined(setjmp) && !defined(_setjmp)) || GFX_COMPILER == GFX_COMILER_KEIL
#define CXT_SAVE setjmp
#else
#define CXT_SAVE _setjmp
#endif
#if (!defined(longjmp) && !defined(_longjmp)) || defined(__KEIL__) || defined(__C51__)
#if (!defined(longjmp) && !defined(_longjmp)) || GFX_COMPILER == GFX_COMILER_KEIL
#define CXT_RESTORE longjmp
#else
#define CXT_RESTORE _longjmp

2
src/gwin/gwin_class.h

@ -23,7 +23,7 @@
#if GFX_USE_GWIN || defined(__DOXYGEN__)
#if defined(__KEIL__) || defined(__C51__)
#if GFX_COMPILER == GFX_COMILER_KEIL
#pragma anon_unions
#endif

Loading…
Cancel
Save