uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Update demos so OS can be specified in the Makefile

Browse Source
This commit is contained in:
inmarket 2013-09-18 23:38:26 +10:00
parent 01a6d6ff95
commit 6858e33285
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/modules/gdisp/gdisp_fonts_cyrillic/gfxconf.h
View File

@ -15,10 +15,10 @@
#define _GFXCONF_H #define _GFXCONF_H
/* The operating system to use - one of these must be defined */ /* The operating system to use - one of these must be defined */
#define GFX_USE_OS_CHIBIOS FALSE //#define GFX_USE_OS_CHIBIOS FALSE
#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_LINUX FALSE //#define GFX_USE_OS_LINUX FALSE
#define GFX_USE_OS_OSX FALSE //#define GFX_USE_OS_OSX FALSE
/* GFX subsystems to turn on */ /* GFX subsystems to turn on */
#define GFX_USE_GDISP TRUE #define GFX_USE_GDISP TRUE

6
demos/modules/gdisp/gdisp_images/gfxconf.h
View File

@ -31,9 +31,9 @@
#define _GFXCONF_H #define _GFXCONF_H
/* The operating system to use - one of these must be defined */ /* The operating system to use - one of these must be defined */
#define GFX_USE_OS_CHIBIOS TRUE //#define GFX_USE_OS_CHIBIOS TRUE
#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_POSIX FALSE //#define GFX_USE_OS_POSIX FALSE
/* GFX sub-systems to turn on */ /* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE #define GFX_USE_GDISP TRUE

6
demos/modules/gdisp/gdisp_images_animated/gfxconf.h
View File

@ -31,9 +31,9 @@
#define _GFXCONF_H #define _GFXCONF_H
/* The operating system to use - one of these must be defined */ /* The operating system to use - one of these must be defined */
#define GFX_USE_OS_CHIBIOS TRUE //#define GFX_USE_OS_CHIBIOS TRUE
#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_POSIX FALSE //#define GFX_USE_OS_POSIX FALSE
/* GFX sub-systems to turn on */ /* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE #define GFX_USE_GDISP TRUE

3
demos/modules/gdisp/gdisp_text/main.c
View File

@ -30,7 +30,7 @@
#include "gfx.h" #include "gfx.h"
int main(void) { int main(void) {
coord_t width, height; coord_t width;
font_t font1, font2, font3, font4; font_t font1, font2, font3, font4;
const char *msg; const char *msg;
@ -39,7 +39,6 @@ int main(void) {
// Get the screen size // Get the screen size
width = gdispGetWidth(); width = gdispGetWidth();
height = gdispGetHeight();
// Get the fonts we want to use // Get the fonts we want to use
font1 = gdispOpenFont("UI2"); font1 = gdispOpenFont("UI2");