diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-02-10 20:27:14 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-02-10 20:27:59 +0100 |
| commit | 295c1c1e8bfe495468a7d8e4996dc836e613df2e (patch) | |
| tree | dd689c762ab832ab02096bbc68e169ec18ee1409 | |
| parent | c9786650258e969deb695d26c4be601ac79eba64 (diff) | |
| download | rockbox-295c1c1e8bfe495468a7d8e4996dc836e613df2e.zip rockbox-295c1c1e8bfe495468a7d8e4996dc836e613df2e.tar.gz rockbox-295c1c1e8bfe495468a7d8e4996dc836e613df2e.tar.bz2 rockbox-295c1c1e8bfe495468a7d8e4996dc836e613df2e.tar.xz | |
checkwps: Fix buildall.sh and some RaaA/ypr0 versions.
Change-Id: I5889743e94ed568c8f7dcc50de0b03b8421969f7
| -rw-r--r-- | apps/misc.c | 2 | ||||
| -rw-r--r-- | firmware/common/rbpaths.c | 4 | ||||
| -rw-r--r-- | tools/checkwps/SOURCES | 4 | ||||
| -rwxr-xr-x | tools/checkwps/buildall.sh | 2 | ||||
| -rw-r--r-- | tools/checkwps/parse_configure.awk | 4 |
5 files changed, 10 insertions, 6 deletions
diff --git a/apps/misc.c b/apps/misc.c index 381512c..3fe330b 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -29,8 +29,8 @@ #include "system.h" #include "lcd.h" #include "file.h" -#include "filefuncs.h" #ifndef __PCTOOL__ +#include "filefuncs.h" #include "lang.h" #include "dir.h" #ifdef HAVE_REMOTE_LCD diff --git a/firmware/common/rbpaths.c b/firmware/common/rbpaths.c index f5a4842..767f165 100644 --- a/firmware/common/rbpaths.c +++ b/firmware/common/rbpaths.c @@ -63,7 +63,7 @@ extern int sim_rmdir(const char* name); const char *rbhome; #endif -#if !defined(SAMSUNG_YPR0) +#if !defined(SAMSUNG_YPR0) && !defined(__PCTOOL__) /* flags for get_user_file_path() */ /* whether you need write access to that file/dir, especially true @@ -255,7 +255,7 @@ int app_open(const char *name, int o, ...) int app_creat(const char* name, mode_t mode) { return creat(name, mode); } int app_remove(const char *name) { return remove(name); } int app_rename(const char *old, const char *new) { return rename(old,new); } -DIR *app_opendir(const char *name) { return opendir(name); } +DIR *app_opendir(const char *name) { return (DIR*)opendir(name); } /* cast to remove warning in checkwps */ int app_mkdir(const char* name) { return mkdir(name); } int app_rmdir(const char* name) { return rmdir(name); } diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES index ab194ad..51b2c28 100644 --- a/tools/checkwps/SOURCES +++ b/tools/checkwps/SOURCES @@ -6,6 +6,10 @@ ../../firmware/common/strlcpy.c checkwps.c +#ifdef APPLICATION +../../firmware/common/rbpaths.c +#endif + #ifdef HAVE_LCD_BITMAP ../../apps/recorder/bmp.c #endif diff --git a/tools/checkwps/buildall.sh b/tools/checkwps/buildall.sh index cb01ad9..a7eb1b7 100755 --- a/tools/checkwps/buildall.sh +++ b/tools/checkwps/buildall.sh @@ -44,7 +44,7 @@ awk -f $rootdir/parse_configure.awk $rootdir/../configure | ( while read target model do make -j $jobs clean - $toolsdir/configure --target=$model --type=C --ram=32 # 32 should always give default RAM + $toolsdir/configure --target=$model --type=C --ram=32 --lcdwidth=100 --lcdheight=100 # 32 should always give default RAM, assume 100x100 for RaaA for now make -j $jobs mv checkwps.$model $outdir done diff --git a/tools/checkwps/parse_configure.awk b/tools/checkwps/parse_configure.awk index 0cb0c0b..19dce81 100644 --- a/tools/checkwps/parse_configure.awk +++ b/tools/checkwps/parse_configure.awk @@ -5,7 +5,7 @@ BEGIN { FS="[|)]" } } /^[ \t]*target="[^"]+"$/ { - match($0, "-D[^\"]+") - target=substr($0, RSTART+2, RLENGTH-2) + match($0, "=\".+\"") + target=substr($0, RSTART+2, RLENGTH-3) print target, model } |