diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
| commit | 6d372f13528f44919ec193d03248d55a53484968 (patch) | |
| tree | 66f6ba33c6bcfed2b5b3846cf1f309e9b7e715e6 /demos/applications | |
| parent | 03914d2d2b438062d3062e2c3a588d53d3040cff (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.gz uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.bz2 uGFX-6d372f13528f44919ec193d03248d55a53484968.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/applications')
| -rw-r--r-- | demos/applications/mandelbrot/demo.mk | 3 | ||||
| -rw-r--r-- | demos/applications/notepad/demo.mk | 3 | ||||
| -rw-r--r-- | demos/applications/notepad/gfxconf.h | 1 | ||||
| -rw-r--r-- | demos/applications/notepad/main.c | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/demos/applications/mandelbrot/demo.mk b/demos/applications/mandelbrot/demo.mk new file mode 100644 index 00000000..e2be68d3 --- /dev/null +++ b/demos/applications/mandelbrot/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/applications/mandelbrot +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/demos/applications/notepad/demo.mk b/demos/applications/notepad/demo.mk new file mode 100644 index 00000000..06c7808d --- /dev/null +++ b/demos/applications/notepad/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/applications/notepad +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h index 7ffb22fa..b3920119 100644 --- a/demos/applications/notepad/gfxconf.h +++ b/demos/applications/notepad/gfxconf.h @@ -47,7 +47,6 @@ #define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_TEXT TRUE
#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_CONTROL TRUE
#define GDISP_NEED_MULTITHREAD TRUE
/* Builtin Fonts */
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c index d2d53464..fb10e86b 100644 --- a/demos/applications/notepad/main.c +++ b/demos/applications/notepad/main.c @@ -79,7 +79,6 @@ int main(void) { gfxInit();
ginputGetMouse(0);
- gdispSetOrientation(GDISP_ROTATE_90);
drawScreen();
|