diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-09-18 23:38:26 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-09-18 23:48:41 +1000 |
| commit | 15a09de6592ec8548057f640eb16c452ac9fa296 (patch) | |
| tree | ce68474a3d361c631a2833d905b42101c269ac81 | |
| parent | 96c4131ca1f1ff3573d393e51d51d38c3b2cc215 (diff) | |
| download | uGFX-15a09de6592ec8548057f640eb16c452ac9fa296.tar.gz uGFX-15a09de6592ec8548057f640eb16c452ac9fa296.tar.bz2 uGFX-15a09de6592ec8548057f640eb16c452ac9fa296.zip | |
Update demos so OS can be specified in the Makefile
| -rw-r--r-- | demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h | 8 | ||||
| -rw-r--r-- | demos/modules/gdisp/gdisp_images/gfxconf.h | 6 | ||||
| -rw-r--r-- | demos/modules/gdisp/gdisp_images_animated/gfxconf.h | 6 | ||||
| -rw-r--r-- | demos/modules/gdisp/gdisp_text/main.c | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h index 997e57dd..a282a5f8 100644 --- a/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h +++ b/demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h @@ -15,10 +15,10 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS FALSE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_LINUX FALSE -#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_CHIBIOS FALSE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_LINUX FALSE +//#define GFX_USE_OS_OSX FALSE /* GFX subsystems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_images/gfxconf.h b/demos/modules/gdisp/gdisp_images/gfxconf.h index 74fffa61..9e37988c 100644 --- a/demos/modules/gdisp/gdisp_images/gfxconf.h +++ b/demos/modules/gdisp/gdisp_images/gfxconf.h @@ -31,9 +31,9 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS TRUE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_POSIX FALSE +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_POSIX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h index eded2fc4..ab91a9e7 100644 --- a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h +++ b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h @@ -31,9 +31,9 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS TRUE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_POSIX FALSE +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_POSIX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE diff --git a/demos/modules/gdisp/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c index dee741fa..7ea3405e 100644 --- a/demos/modules/gdisp/gdisp_text/main.c +++ b/demos/modules/gdisp/gdisp_text/main.c @@ -30,7 +30,7 @@ #include "gfx.h"
int main(void) {
- coord_t width, height;
+ coord_t width;
font_t font1, font2, font3, font4;
const char *msg;
@@ -39,7 +39,6 @@ int main(void) { // Get the screen size
width = gdispGetWidth();
- height = gdispGetHeight();
// Get the fonts we want to use
font1 = gdispOpenFont("UI2");
|