aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-10-28 01:00:02 +0100
committerJoel Bodenmann <joel@unormal.org>2013-10-28 01:00:02 +0100
commit1e9dcc4a286a17abf48703a632c2a3a42c856567 (patch)
tree3c9e67f4bdc5396855f98baf2597bc6fcd59888b
parentc03add3334f039ba6d5aa1278a83a136f6acc537 (diff)
downloaduGFX-1e9dcc4a286a17abf48703a632c2a3a42c856567.tar.gz
uGFX-1e9dcc4a286a17abf48703a632c2a3a42c856567.tar.bz2
uGFX-1e9dcc4a286a17abf48703a632c2a3a42c856567.zip
uncommented GOS selection in GDISP and GWIN demos
-rw-r--r--demos/modules/gdisp/basics/gfxconf.h10
-rw-r--r--demos/modules/gdisp/circles/gfxconf.h10
-rw-r--r--demos/modules/gdisp/fonts/gfxconf.h10
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/gfxconf.h10
-rw-r--r--demos/modules/gdisp/images/gfxconf.h10
-rw-r--r--demos/modules/gdisp/images_animated/gfxconf.h10
-rw-r--r--demos/modules/gwin/basic/gfxconf.h10
-rw-r--r--demos/modules/gwin/button/gfxconf.h10
-rw-r--r--demos/modules/gwin/checkbox/gfxconf.h10
-rw-r--r--demos/modules/gwin/console/gfxconf.h10
-rw-r--r--demos/modules/gwin/graph/gfxconf.h10
-rw-r--r--demos/modules/gwin/list/gfxconf.h10
-rw-r--r--demos/modules/gwin/radio/gfxconf.h10
-rw-r--r--demos/modules/gwin/slider/gfxconf.h10
-rw-r--r--demos/modules/gwin/widgets/gfxconf.h10
-rw-r--r--gfxconf.example.h2
16 files changed, 76 insertions, 76 deletions
diff --git a/demos/modules/gdisp/basics/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h
index ff365590..60b8888e 100644
--- a/demos/modules/gdisp/basics/gfxconf.h
+++ b/demos/modules/gdisp/basics/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h
index cb698fce..28311ccb 100644
--- a/demos/modules/gdisp/circles/gfxconf.h
+++ b/demos/modules/gdisp/circles/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/fonts/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h
index ffb3a7e7..9f569e37 100644
--- a/demos/modules/gdisp/fonts/gfxconf.h
+++ b/demos/modules/gdisp/fonts/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
index 713c89b4..1bf1baeb 100644
--- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
+++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 694bad28..0bf9f1fc 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h
index e0158441..8cf34e87 100644
--- a/demos/modules/gdisp/images_animated/gfxconf.h
+++ b/demos/modules/gdisp/images_animated/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h
index 1e6784fd..411ad9cf 100644
--- a/demos/modules/gwin/basic/gfxconf.h
+++ b/demos/modules/gwin/basic/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/button/gfxconf.h b/demos/modules/gwin/button/gfxconf.h
index 6d0aa41d..2199e891 100644
--- a/demos/modules/gwin/button/gfxconf.h
+++ b/demos/modules/gwin/button/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/checkbox/gfxconf.h b/demos/modules/gwin/checkbox/gfxconf.h
index 9bcda6be..9be70462 100644
--- a/demos/modules/gwin/checkbox/gfxconf.h
+++ b/demos/modules/gwin/checkbox/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h
index c1307302..42ad5e12 100644
--- a/demos/modules/gwin/console/gfxconf.h
+++ b/demos/modules/gwin/console/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index e829605a..684d0e7a 100644
--- a/demos/modules/gwin/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h
index 19d395c0..ab9cc008 100644
--- a/demos/modules/gwin/list/gfxconf.h
+++ b/demos/modules/gwin/list/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/radio/gfxconf.h b/demos/modules/gwin/radio/gfxconf.h
index 0e41b7ae..595042fb 100644
--- a/demos/modules/gwin/radio/gfxconf.h
+++ b/demos/modules/gwin/radio/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
index 5442c508..8a1be49d 100644
--- a/demos/modules/gwin/slider/gfxconf.h
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index 57cf8285..0299f2ef 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#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
+/* The operating system to use. One of these must be defined - perferably in your Makefile */
+//#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 sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/gfxconf.example.h b/gfxconf.example.h
index 44945780..f7e72890 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -14,7 +14,7 @@
#ifndef _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 - perferably in your Makefile */
#define GFX_USE_OS_CHIBIOS FALSE
#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_LINUX FALSE