diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2008-11-24 22:16:07 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-24 22:16:07 +0000 |
| commit | ad8d6031c18d131a4f63bc12110a49efb482dafe (patch) | |
| tree | c9159d712bf857a98751def6b773d1ed6323f046 /apps | |
| parent | 4c43f7be0aa634904f0da2eca3d51876419aa36d (diff) | |
| download | rockbox-ad8d6031c18d131a4f63bc12110a49efb482dafe.zip rockbox-ad8d6031c18d131a4f63bc12110a49efb482dafe.tar.gz rockbox-ad8d6031c18d131a4f63bc12110a49efb482dafe.tar.bz2 rockbox-ad8d6031c18d131a4f63bc12110a49efb482dafe.tar.xz | |
Added support for configurable rockbox directory. FS#9567 by Alex Bennee.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19208 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/wps_parser.c | 2 | ||||
| -rw-r--r-- | apps/settings.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index ca15348..88601fd 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -443,7 +443,7 @@ static char *get_image_filename(const char *start, const char* bmpdir, { const char *end = strchr(start, '|'); - if ( !end || (end - start) >= (buf_size - ROCKBOX_DIR_LEN - 2) ) + if ( !end || (end - start) >= (buf_size - (int)ROCKBOX_DIR_LEN - 2) ) { buf = "\0"; return NULL; diff --git a/apps/settings.h b/apps/settings.h index 8448059..c5658aa 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -57,10 +57,15 @@ struct opt_items { #define ROCKBOX_DIR "." #define ROCKBOX_DIR_LEN 1 #else -#define ROCKBOX_DIR "/.rockbox" -#define ROCKBOX_DIR_LEN 9 + +/* ROCKBOX_DIR is now defined in autoconf.h for flexible build types */ +#ifndef ROCKBOX_DIR +#error ROCKBOX_DIR not defined (should be in autoconf.h) +#endif +#define ROCKBOX_DIR_LEN sizeof(ROCKBOX_DIR) #endif + #define FONT_DIR ROCKBOX_DIR "/fonts" #define LANG_DIR ROCKBOX_DIR "/langs" #define WPS_DIR ROCKBOX_DIR "/wps" |