diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-02-23 22:54:33 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-02-23 22:54:33 +0000 |
| commit | f928c8f0f854a91323b19357021bcaef9a7cc27e (patch) | |
| tree | f8e2bfd3bfa603ad1e6b23552de8e7f0c332fe0d /wps/wpsbuild.pl | |
| parent | 580eee51b4aacc674c0a0ec93255d273c6262993 (diff) | |
| download | rockbox-f928c8f0f854a91323b19357021bcaef9a7cc27e.tar.gz rockbox-f928c8f0f854a91323b19357021bcaef9a7cc27e.zip | |
Turned out that setting the viewer iconset to empty properly chooses the default iconset, and the problem with the default viewer iconset on greyscale targets was that there was a file too much in icons/. The defaults are copied from elsewhere, and differ between grey/mono and colour targets. The extraneous file overwrote the default when building the .zip.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16399 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'wps/wpsbuild.pl')
| -rwxr-xr-x | wps/wpsbuild.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index a07909ca77..cb9ccbfc80 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -144,8 +144,10 @@ sub copythemeviewericon { #copy the viewer icon specified by the theme - $viewericon =~ /\/(.*icons\/(.*))/i; - `cp $ROOT/icons/$2 $1`; + if ($viewericon ne '') { + $viewericon =~ /\/(.*icons\/(.*))/i; + `cp $ROOT/icons/$2 $1`; + } } sub copywps @@ -244,7 +246,7 @@ MOO if(defined($iconset)) { push @out, "iconset: $iconset\n"; } - if($viewericon) { + if(defined($viewericon)) { push @out, "viewers iconset: $viewericon\n"; } if($lineselecttextcolor && $main_depth > 2 ) { |