diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-12-17 21:35:25 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-12-17 21:35:25 +0000 |
commit | 01a8a7f7af90407b2acff5908c53be89a5130dc6 (patch) | |
tree | 2f4b95e9b3262f2493ed050da7c00f8f84cea9ed /rbutil | |
parent | 213d9a2ca1cdd93511e84ca2a857bc82e8b0e661 (diff) | |
download | rockbox-01a8a7f7af90407b2acff5908c53be89a5130dc6.tar.gz rockbox-01a8a7f7af90407b2acff5908c53be89a5130dc6.zip |
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
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt-win.qrc | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.qrc | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/tts.cpp | 2 |
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 @@ | |||
1 | <RCC> | ||
2 | <qresource> | ||
3 | <file alias="builtin/sapi_voice.vbs">../../tools/sapi_voice.vbs</file> | ||
4 | </qresource> | ||
5 | </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 \ | |||
118 | sapicfgfrm.ui | 118 | sapicfgfrm.ui |
119 | 119 | ||
120 | RESOURCES += rbutilqt.qrc | 120 | RESOURCES += rbutilqt.qrc |
121 | win32 { | ||
122 | RESOURCES += rbutilqt-win.qrc | ||
123 | } | ||
121 | 124 | ||
122 | TRANSLATIONS += rbutil_de.ts \ | 125 | TRANSLATIONS += rbutil_de.ts \ |
123 | rbutil_fr.ts \ | 126 | rbutil_fr.ts \ |
@@ -155,11 +158,3 @@ static { | |||
155 | message("using static plugin") | 158 | message("using static plugin") |
156 | } | 159 | } |
157 | 160 | ||
158 | # copy sapi script | ||
159 | win32 { | ||
160 | system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs) | ||
161 | } | ||
162 | !win32 { | ||
163 | system(mkdir builtin) | ||
164 | system(cp ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs) | ||
165 | } \ 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 @@ | |||
1 | <RCC> | 1 | <RCC> |
2 | <qresource prefix="/builtin" > | ||
3 | <file>builtin/sapi_voice.vbs</file> | ||
4 | </qresource> | ||
5 | <qresource prefix="/docs" > | 2 | <qresource prefix="/docs" > |
6 | <file>CREDITS</file> | 3 | <file>CREDITS</file> |
7 | <file>gpl-2.0.html</file> | 4 | <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() | |||
260 | m_TTSLanguage =userSettings->value("ttslanguage","").toString(); | 260 | m_TTSLanguage =userSettings->value("ttslanguage","").toString(); |
261 | userSettings->endGroup(); | 261 | userSettings->endGroup(); |
262 | 262 | ||
263 | QFile::copy(":/builtin/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs"); | 263 | QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs"); |
264 | m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs"; | 264 | m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs"; |
265 | 265 | ||
266 | QFileInfo tts(m_TTSexec); | 266 | QFileInfo tts(m_TTSexec); |