summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-01-29 21:51:26 +0100
committerThomas Martitz <kugel@rockbox.org>2012-01-29 22:35:49 +0100
commit112bc71a0c7d5a981d37eaa5062f8a93d7ccc067 (patch)
treeb5e017d472a52d2b5c0568cfc00443795ab86a0b
parent476fcfa53858747ffde57014bbc77682018f1d8e (diff)
downloadrockbox-112bc71a0c7d5a981d37eaa5062f8a93d7ccc067.tar.gz
rockbox-112bc71a0c7d5a981d37eaa5062f8a93d7ccc067.zip
Fix building test plugins on non-touch targets, for real.
Change-Id: I8f2105fe3357f00d9e085444cd867bec0e2a7143
-rw-r--r--apps/plugins/test_codec.c14
-rw-r--r--apps/plugins/test_fps.c13
2 files changed, 10 insertions, 17 deletions
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 50d3fc93ef..3e13842cfb 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -816,19 +816,15 @@ void cleanup(void)
816} 816}
817#endif 817#endif
818 818
819
820static struct touchbutton button[] = {
821 {
822 .action = ACTION_STD_OK,
823 .title = "OK",
824 /* viewport runtime initialized, rest false/NULL */
825 }
826};
827
828void plugin_quit(void) 819void plugin_quit(void)
829{ 820{
830 int btn; 821 int btn;
831#ifdef HAVE_TOUCHSCREEN 822#ifdef HAVE_TOUCHSCREEN
823 static struct touchbutton button[] = {{
824 .action = ACTION_STD_OK,
825 .title = "OK",
826 /* viewport runtime initialized, rest false/NULL */
827 }};
832 struct viewport *vp = &button[0].vp; 828 struct viewport *vp = &button[0].vp;
833 struct screen *lcd = rb->screens[SCREEN_MAIN]; 829 struct screen *lcd = rb->screens[SCREEN_MAIN];
834 rb->viewport_set_defaults(vp, SCREEN_MAIN); 830 rb->viewport_set_defaults(vp, SCREEN_MAIN);
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index caabde4d1b..d5bfb55907 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -360,17 +360,14 @@ static void time_greyscale(void)
360} 360}
361#endif 361#endif
362 362
363static struct touchbutton button[] = {
364 {
365 .action = ACTION_STD_OK,
366 .title = "OK",
367 /* viewport runtime initialized, rest false/NULL */
368 }
369};
370
371void plugin_quit(void) 363void plugin_quit(void)
372{ 364{
373#ifdef HAVE_TOUCHSCREEN 365#ifdef HAVE_TOUCHSCREEN
366 static struct touchbutton button[] = {{
367 .action = ACTION_STD_OK,
368 .title = "OK",
369 /* .vp runtime initialized, rest false/NULL */
370 }};
374 struct viewport *vp = &button[0].vp; 371 struct viewport *vp = &button[0].vp;
375 struct screen *lcd = rb->screens[SCREEN_MAIN]; 372 struct screen *lcd = rb->screens[SCREEN_MAIN];
376 rb->viewport_set_defaults(vp, SCREEN_MAIN); 373 rb->viewport_set_defaults(vp, SCREEN_MAIN);