summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/buildzip.pl2
-rw-r--r--wps/WPSLIST5
-rw-r--r--wps/progressive.11x2x1.wps3
-rwxr-xr-xwps/wpsbuild.pl30
4 files changed, 24 insertions, 16 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 3ddb0163d3..380c3a41e2 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -178,6 +178,7 @@ sub buildzip {
}
mkdir ".rockbox/wps", 0777;
+ mkdir ".rockbox/themes", 0777;
mkdir ".rockbox/codepages", 0777;
if($bitmap) {
@@ -191,7 +192,6 @@ sub buildzip {
if($bitmap) {
mkdir ".rockbox/codecs", 0777;
- mkdir ".rockbox/themes", 0777;
if($depth > 1) {
mkdir ".rockbox/backdrops", 0777;
}
diff --git a/wps/WPSLIST b/wps/WPSLIST
index a633764ebb..75d7f060f0 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -191,3 +191,8 @@ Foreground Color: 000000
Background Color: FFC000
Statusbar: on
</wps>
+
+<wps>
+Name: progressive.wps
+Author: Jens Arnold
+</wps> \ No newline at end of file
diff --git a/wps/progressive.11x2x1.wps b/wps/progressive.11x2x1.wps
new file mode 100644
index 0000000000..1e5d853726
--- /dev/null
+++ b/wps/progressive.11x2x1.wps
@@ -0,0 +1,3 @@
+#wps for the archos player with text alignment
+%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>
+%al%pc%ac%pb%ar%pt \ No newline at end of file
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index b33e70bf4a..46aa46eeb8 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -56,11 +56,9 @@ STOP
else {
print GCC <<STOP
\#include "config.h"
-#ifdef HAVE_LCD_BITMAP
Height: LCD_HEIGHT
Width: LCD_WIDTH
Depth: LCD_DEPTH
-#endif
STOP
;
}
@@ -93,7 +91,7 @@ STOP
return ($height, $width, $depth);
}
-sub mkdirs {
+sub mkdirs {
my $wpsdir = $wps;
$wpsdir =~ s/\.(r|)wps//;
mkdir ".rockbox/wps", 0777;
@@ -132,20 +130,22 @@ sub copywps {
}
close(WPSFILE);
- if (-e "$dir/$wps_prefix/$req_g") {
- foreach $file (@filelist) {
- system("cp $dir/$wps_prefix/$req_g/$file .rockbox/wps/$wps_prefix/");
+ if ($#filelist >= 0) {
+ if (-e "$dir/$wps_prefix/$req_g") {
+ foreach $file (@filelist) {
+ system("cp $dir/$wps_prefix/$req_g/$file .rockbox/wps/$wps_prefix/");
+ }
+ }
+ elsif (-e "$dir/$wps_prefix") {
+ foreach $file (@filelist) {
+ system("cp $dir/$wps_prefix/$file .rockbox/wps/$wps_prefix/");
+ }
}
- }
- elsif (-e "$dir/$wps_prefix") {
- foreach $file (@filelist) {
- system("cp $dir/$wps_prefix/$file .rockbox/wps/$wps_prefix/");
+ else {
+ print STDERR "beep, no dir to copy WPS from!\n";
}
- }
- else {
- print STDERR "beep, no dir to copy WPS from!\n";
}
-
+
} else {
print STDERR "Skipping $wps - no matching resolution.\n";
}
@@ -255,7 +255,7 @@ while(<WPS>) {
$req_g = $rwidth . "x" . $rheight . "x" . $d;
$req_g_wps = $wps_prefix . "." . $req_g . ".wps";
- last if (-e "$wpsdir/$req_g_wps");
+ last if (-e "$wpsdir/$req_g_wps");
if ($isrwps) {
$req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth";