diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-30 15:44:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-03 16:48:04 -0600 |
| commit | 1edc1dfd51438e8f0d1fa4e91a02b912b52eb7fe (patch) | |
| tree | 60a98b21cbb1c6ae1f8b5ab08fb94467590e3a15 /apps/graphics | |
| parent | 5830a64163a3b4d3ce0e9161e126fd979e7dc8e5 (diff) | |
| download | nuttx-1edc1dfd51438e8f0d1fa4e91a02b912b52eb7fe.tar.gz nuttx-1edc1dfd51438e8f0d1fa4e91a02b912b52eb7fe.tar.bz2 nuttx-1edc1dfd51438e8f0d1fa4e91a02b912b52eb7fe.zip | |
A few more traveler fixes
Diffstat (limited to 'apps/graphics')
| -rw-r--r-- | apps/graphics/traveler/Kconfig | 1 | ||||
| -rwxr-xr-x | apps/graphics/traveler/src/trv_main.c | 6 |
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; |