commit 112bc71a0c7d5a981d37eaa5062f8a93d7ccc067
author Thomas Martitz <kugel@rockbox.org> Sun Jan 29 21:51:26 2012 +0100
committer Thomas Martitz <kugel@rockbox.org> Sun Jan 29 22:35:49 2012 +0100
tree b5e017d472a52d2b5c0568cfc00443795ab86a0b
parent 476fcfa53858747ffde57014bbc77682018f1d8e

Fix building test plugins on non-touch targets, for real.

Change-Id: I8f2105fe3357f00d9e085444cd867bec0e2a7143

apps/plugins/test_codec.c

diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 50d3fc9..3e13842 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -816,19 +816,15 @@
 }
 #endif
 
-
-static struct touchbutton button[] = {
-    {
-        .action = ACTION_STD_OK,
-        .title = "OK",
-        /* viewport runtime initialized, rest false/NULL */
-    }
-};
-
 void plugin_quit(void)
 {
     int btn;
 #ifdef HAVE_TOUCHSCREEN
+    static struct touchbutton button[] = {{
+        .action = ACTION_STD_OK,
+        .title = "OK",
+        /* viewport runtime initialized, rest false/NULL */
+    }};
     struct viewport *vp = &button[0].vp;
     struct screen *lcd = rb->screens[SCREEN_MAIN];
     rb->viewport_set_defaults(vp, SCREEN_MAIN);

apps/plugins/test_fps.c

diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index caabde4..d5bfb55 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -360,17 +360,14 @@
 }
 #endif
 
-static struct touchbutton button[] = {
-    {
-        .action = ACTION_STD_OK,
-        .title = "OK",
-        /* viewport runtime initialized, rest false/NULL */
-    }
-};
-
 void plugin_quit(void)
 {
 #ifdef HAVE_TOUCHSCREEN
+    static struct touchbutton button[] = {{
+            .action = ACTION_STD_OK,
+            .title = "OK",
+            /* .vp runtime initialized, rest false/NULL */
+    }};
     struct viewport *vp = &button[0].vp;
     struct screen *lcd = rb->screens[SCREEN_MAIN];
     rb->viewport_set_defaults(vp, SCREEN_MAIN);