summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2007-12-16 18:56:45 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2007-12-16 18:56:45 +0000
commit646d39ec4e51c2736737a5689f37256e31db2620 (patch)
tree387bd6ce0655452b10015eb2458cd21e03774ae3
parent1e16e0e1c00bc4fe044d4324bdb5eab531a9c00b (diff)
downloadrockbox-646d39ec4e51c2736737a5689f37256e31db2620.zip
rockbox-646d39ec4e51c2736737a5689f37256e31db2620.tar.gz
rockbox-646d39ec4e51c2736737a5689f37256e31db2620.tar.bz2
rockbox-646d39ec4e51c2736737a5689f37256e31db2620.tar.xz
Accept two rbutil patches by Clemens Werther:
* FS#8336: make rbutil compile on non-windows machines * FS#8337: change target link for the "help" menu item git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15945 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro3
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index c93fcfa..352b550 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -355,6 +355,7 @@ Martin Crkovský
Ariya Hidayat
Jonas Hurrelmann
Lee Kang Hyuk
+Clemens Werther
The libmad team
The wavpack team
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 395e538..62a7fee 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -242,7 +242,7 @@ void RbUtilQt::about()
void RbUtilQt::help()
{
- QUrl helpurl("http://www.rockbox.org/wiki/RockboxUtilityQt");
+ QUrl helpurl("http://www.rockbox.org/wiki/RockboxUtility");
QDesktopServices::openUrl(helpurl);
}
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 0277fd6..e1a71b3 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -160,5 +160,6 @@ win32 {
system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs)
}
!win32 {
- system(copy ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs)
+ system(mkdir builtin)
+ system(cp ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs)
} \ No newline at end of file