summaryrefslogtreecommitdiff
path: root/apps/graphics
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-30 15:44:11 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-30 15:44:11 -0600
commit0f7233e2d9d481934f4d60329c592a6c3eb2bc72 (patch)
treef0fa1f3df3940c8bcd38ffc04c83646c15eee81b /apps/graphics
parent7a8e59a994ed51b53125131b289a7d298ee69777 (diff)
downloadnuttx-0f7233e2d9d481934f4d60329c592a6c3eb2bc72.tar.gz
nuttx-0f7233e2d9d481934f4d60329c592a6c3eb2bc72.tar.bz2
nuttx-0f7233e2d9d481934f4d60329c592a6c3eb2bc72.zip
A few more traveler fixes
Diffstat (limited to 'apps/graphics')
-rw-r--r--apps/graphics/traveler/Kconfig1
-rwxr-xr-xapps/graphics/traveler/src/trv_main.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/graphics/traveler/Kconfig b/apps/graphics/traveler/Kconfig
index 3feee99bb..e938ec742 100644
--- a/apps/graphics/traveler/Kconfig
+++ b/apps/graphics/traveler/Kconfig
@@ -8,6 +8,7 @@ if GRAPHICS_TRAVELER
config GRAPHICS_TRAVELER_PERFMON
bool "Performance monitor game"
default y
+ depends on NX && FS_READABLE && !NX_LCDDRIVER
---help---
Enable or disable performance monitoring instrumentation and output.
diff --git a/apps/graphics/traveler/src/trv_main.c b/apps/graphics/traveler/src/trv_main.c
index 6f74055ba..604ff2975 100755
--- a/apps/graphics/traveler/src/trv_main.c
+++ b/apps/graphics/traveler/src/trv_main.c
@@ -149,7 +149,11 @@ static double trv_current_time(void)
* Description:
****************************************************************************/
-int main(int argc, char *argv[])
+#ifdef CONFIG_BUILD_KERNEL
+int main(int argc, FAR char *argv[])
+#else
+int traveler_main(int argc, char *argv[])
+#endif
{
FAR struct trv_graphics_info_s ginfo;
struct trv_framebuffer_s frame;