merging GDISPStreaming

1 files changed, 4 insertions, 10 deletions

diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index 95d5dc5e..7ffb22fa 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -30,14 +30,14 @@
 #ifndef _GFXCONF_H

 #define _GFXCONF_H

 

-/* The operating system to use - one of these must be defined */

-//#define GFX_USE_OS_CHIBIOS		TRUE

+/* The operating system to use. One of these must be defined - preferably in your Makefile */

+//#define GFX_USE_OS_CHIBIOS	FALSE

 //#define GFX_USE_OS_WIN32		FALSE

-//#define GFX_USE_OS_POSIX		FALSE

+//#define GFX_USE_OS_LINUX		FALSE

+//#define GFX_USE_OS_OSX		FALSE

 

 /* GFX sub-systems to turn on */

 #define GFX_USE_GDISP			TRUE

-#define GFX_USE_GWIN			FALSE

 #define GFX_USE_GEVENT			TRUE

 #define GFX_USE_GTIMER			TRUE

 #define GFX_USE_GINPUT			TRUE

@@ -47,14 +47,8 @@
 #define GDISP_NEED_CLIP			TRUE

 #define GDISP_NEED_TEXT			TRUE

 #define GDISP_NEED_CIRCLE		TRUE

-#define GDISP_NEED_ELLIPSE		FALSE

-#define GDISP_NEED_ARC			FALSE

-#define GDISP_NEED_SCROLL		FALSE

-#define GDISP_NEED_PIXELREAD	FALSE

 #define GDISP_NEED_CONTROL		TRUE

 #define GDISP_NEED_MULTITHREAD	TRUE

-#define GDISP_NEED_ASYNC		FALSE

-#define GDISP_NEED_MSGAPI		FALSE

 

 /* Builtin Fonts */

 #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		TRUE