diff options
| -rw-r--r-- | android/.classpath | 1 | ||||
| -rwxr-xr-x | wps/wpsbuild.pl | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/.classpath b/android/.classpath index 1b4b1ee..0ca188f 100644 --- a/android/.classpath +++ b/android/.classpath @@ -3,5 +3,6 @@ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> + <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index ce4e0e9..6df35df 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -589,20 +589,19 @@ while(<WPS>) { # mangles some filenames if (defined($backdrop) && $backdrop ne "-") { copybackdrop(); - $backdrop = normalize($backdrop); + $backdrop = "$rbdir/" . normalize($backdrop); } foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) { if (defined($i) && $i ne "-") { copythemeicon($i); + $i = "$rbdir/$i"; } } - if (defined($font) && $font ne "-") { - copythemefont($font); - $font = "$rbdir/fonts/$font"; - } - if (defined($remotefont) && $remotefont ne "-") { - copythemefont($remotefont); - $remotefont = "$rbdir/fonts/$remotefont"; + foreach my $i ($font, $remotefont) { + if (defined($i) && $i ne "-") { + copythemefont($font); + $i = "$rbdir/fonts/$font"; + } } buildcfg(); copywps(); |