move w32-specific resources to a separate file to prevent building them on other platforms. Use an alias in the resource file to remove the need of copying the file.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15949 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 9 insertions, 12 deletions

diff --git a/rbutil/rbutilqt/rbutilqt-win.qrc b/rbutil/rbutilqt/rbutilqt-win.qrc
new file mode 100644
index 0000000000..470b99a7ee
--- /dev/null
+++ b/rbutil/rbutilqt/rbutilqt-win.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource>
+        <file alias="builtin/sapi_voice.vbs">../../tools/sapi_voice.vbs</file>
+    </qresource>
+</RCC>
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index e1a71b35f1..ced8bf3da0 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -118,6 +118,9 @@ FORMS += rbutilqtfrm.ui \
  sapicfgfrm.ui
 
 RESOURCES += rbutilqt.qrc
+win32 {
+    RESOURCES += rbutilqt-win.qrc
+}
 
 TRANSLATIONS += rbutil_de.ts \
  rbutil_fr.ts \
@@ -155,11 +158,3 @@ static {
     message("using static plugin")
 }
 
-# copy sapi script
-win32 {
-    system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs)
-}
-!win32 {
-    system(mkdir builtin)
-    system(cp ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs)
-}
\ No newline at end of file
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 2df1a422b8..0e571d6585 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -1,7 +1,4 @@
 <RCC>
-    <qresource prefix="/builtin" >
-        <file>builtin/sapi_voice.vbs</file>
-    </qresource>
     <qresource prefix="/docs" >
         <file>CREDITS</file>
         <file>gpl-2.0.html</file>
diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp
index 9014044ed8..aa5f661fcb 100644
--- a/rbutil/rbutilqt/tts.cpp
+++ b/rbutil/rbutilqt/tts.cpp
@@ -260,7 +260,7 @@ bool TTSSapi::start()
     m_TTSLanguage =userSettings->value("ttslanguage","").toString();
     userSettings->endGroup();
 
-    QFile::copy(":/builtin/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
+    QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
     m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
     
     QFileInfo tts(m_TTSexec);