From e43b85f96acb41514edfffdb93768f3f22d24e3a Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Tue, 22 Oct 2013 16:36:45 +0000
Subject: project muid for vc11 fixed m_speak file renamed to m_winterspeak and
moved to ExternalAPI
git-svn-id: http://svn.miranda-ng.org/main/trunk@6588 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/ExternalAPI/m_winterspeak.h | 4 ++++
plugins/WinterSpeak/WinterSpeak_10.vcxproj | 21 ++++++++++++---------
plugins/WinterSpeak/WinterSpeak_10.vcxproj.filters | 16 ++++++++++++++--
plugins/WinterSpeak/WinterSpeak_11.vcxproj | 17 ++++++++---------
plugins/WinterSpeak/WinterSpeak_11.vcxproj.filters | 3 ---
plugins/WinterSpeak/src/Common.h | 4 ++--
plugins/WinterSpeak/src/Version.h | 4 ++--
plugins/WinterSpeak/src/m_speak.h | 4 ----
8 files changed, 42 insertions(+), 31 deletions(-)
create mode 100644 plugins/ExternalAPI/m_winterspeak.h
delete mode 100644 plugins/WinterSpeak/src/m_speak.h
diff --git a/plugins/ExternalAPI/m_winterspeak.h b/plugins/ExternalAPI/m_winterspeak.h
new file mode 100644
index 0000000000..3c0d418012
--- /dev/null
+++ b/plugins/ExternalAPI/m_winterspeak.h
@@ -0,0 +1,4 @@
+
+
+#define MS_SPEAK_STATUS "Speak/Status"
+#define MS_SPEAK_MESSAGE "Speak/Message"
\ No newline at end of file
diff --git a/plugins/WinterSpeak/WinterSpeak_10.vcxproj b/plugins/WinterSpeak/WinterSpeak_10.vcxproj
index 36086c43b1..3eab337727 100644
--- a/plugins/WinterSpeak/WinterSpeak_10.vcxproj
+++ b/plugins/WinterSpeak/WinterSpeak_10.vcxproj
@@ -77,7 +77,7 @@
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -94,7 +94,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -103,7 +103,7 @@
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -120,7 +120,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,7 +130,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -150,7 +150,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -160,7 +160,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -180,7 +180,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -192,12 +192,13 @@
<ClInclude Include="src\DialogConfigEngine.h" />
<ClInclude Include="src\EventInformation.h" />
<ClInclude Include="src\MirandaDialog.h" />
- <ClInclude Include="src\m_speak.h" />
<ClInclude Include="src\Observer.h" />
<ClInclude Include="src\ProtocolInformation.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\SpeakAnnounce.h" />
<ClInclude Include="src\SpeakConfig.h" />
+ <ClInclude Include="src\SpeechApi40a.h" />
+ <ClInclude Include="src\SpeechApi40aLexicon.h" />
<ClInclude Include="src\SpeechApi51.h" />
<ClInclude Include="src\SpeechApi51Lexicon.h" />
<ClInclude Include="src\SpeechInterface.h" />
@@ -220,6 +221,8 @@
<ClCompile Include="src\ProtocolInformation.cpp" />
<ClCompile Include="src\SpeakAnnounce.cpp" />
<ClCompile Include="src\SpeakConfig.cpp" />
+ <ClCompile Include="src\SpeechApi40a.cpp" />
+ <ClCompile Include="src\SpeechApi40aLexicon.cpp" />
<ClCompile Include="src\SpeechApi51.cpp" />
<ClCompile Include="src\SpeechApi51Lexicon.cpp" />
<ClCompile Include="src\SpeechInterface.cpp" />
diff --git a/plugins/WinterSpeak/WinterSpeak_10.vcxproj.filters b/plugins/WinterSpeak/WinterSpeak_10.vcxproj.filters
index ce06663320..3a467283cb 100644
--- a/plugins/WinterSpeak/WinterSpeak_10.vcxproj.filters
+++ b/plugins/WinterSpeak/WinterSpeak_10.vcxproj.filters
@@ -34,6 +34,9 @@
<Filter Include="Source Files\text_to_speech\speech_api_51">
<UniqueIdentifier>{79aaf01a-24a8-425a-a166-75f9a925b5a4}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\text_to_speech\speech_api_40a">
+ <UniqueIdentifier>{bc35ee8c-e94f-4d06-8e83-77d143ead7bb}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\resource.h">
@@ -99,8 +102,11 @@
<ClInclude Include="src\TextToSpeech.h">
<Filter>Source Files\text_to_speech</Filter>
</ClInclude>
- <ClInclude Include="src\m_speak.h">
- <Filter>Source Files</Filter>
+ <ClInclude Include="src\SpeechApi40a.h">
+ <Filter>Source Files\text_to_speech\speech_api_40a</Filter>
+ </ClInclude>
+ <ClInclude Include="src\SpeechApi40aLexicon.h">
+ <Filter>Source Files\text_to_speech\speech_api_40a</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -169,5 +175,11 @@
<ClCompile Include="src\TextToSpeech.cpp">
<Filter>Source Files\text_to_speech</Filter>
</ClCompile>
+ <ClCompile Include="src\SpeechApi40a.cpp">
+ <Filter>Source Files\text_to_speech\speech_api_40a</Filter>
+ </ClCompile>
+ <ClCompile Include="src\SpeechApi40aLexicon.cpp">
+ <Filter>Source Files\text_to_speech\speech_api_40a</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/plugins/WinterSpeak/WinterSpeak_11.vcxproj b/plugins/WinterSpeak/WinterSpeak_11.vcxproj
index 66606908e9..88f78e071a 100644
--- a/plugins/WinterSpeak/WinterSpeak_11.vcxproj
+++ b/plugins/WinterSpeak/WinterSpeak_11.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>WinterSpeak</ProjectName>
- <ProjectGuid>{18195F68-A747-8643-050C-C5101DA658FD}</ProjectGuid>
+ <ProjectGuid>{A44F96D0-A850-4A67-9570-0E9298A16E40}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -81,7 +81,7 @@
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\include;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -108,7 +108,7 @@
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -125,7 +125,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -135,7 +135,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -154,7 +154,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -164,7 +164,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>..\..\include;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;C:\Program Files (x86)\Microsoft Speech SDK\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -183,7 +183,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>C:\Program Files (x86)\Microsoft Speech SDK\Lib\spchwrap.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -195,7 +195,6 @@
<ClInclude Include="src\DialogConfigEngine.h" />
<ClInclude Include="src\EventInformation.h" />
<ClInclude Include="src\MirandaDialog.h" />
- <ClInclude Include="src\m_speak.h" />
<ClInclude Include="src\Observer.h" />
<ClInclude Include="src\ProtocolInformation.h" />
<ClInclude Include="src\resource.h" />
diff --git a/plugins/WinterSpeak/WinterSpeak_11.vcxproj.filters b/plugins/WinterSpeak/WinterSpeak_11.vcxproj.filters
index 43c1399f6e..3a467283cb 100644
--- a/plugins/WinterSpeak/WinterSpeak_11.vcxproj.filters
+++ b/plugins/WinterSpeak/WinterSpeak_11.vcxproj.filters
@@ -102,9 +102,6 @@
<ClInclude Include="src\TextToSpeech.h">
<Filter>Source Files\text_to_speech</Filter>
</ClInclude>
- <ClInclude Include="src\m_speak.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="src\SpeechApi40a.h">
<Filter>Source Files\text_to_speech\speech_api_40a</Filter>
</ClInclude>
diff --git a/plugins/WinterSpeak/src/Common.h b/plugins/WinterSpeak/src/Common.h
index cff8761c21..59763967e0 100644
--- a/plugins/WinterSpeak/src/Common.h
+++ b/plugins/WinterSpeak/src/Common.h
@@ -3,8 +3,8 @@
#include <windows.h>
#include <Winsock2.h>
-
#include <CommCtrl.h>
+
#include <newpluginapi.h>
#include <m_langpack.h>
#include <m_genmenu.h>
@@ -19,10 +19,10 @@
#include <m_netlib.h>
#include <m_extraicons.h>
+#include "m_winterspeak.h"
#include "resource.h"
#include "Version.h"
-#include "m_speak.h"
#include "DialogConfigEngine.h"
#include "DialogConfigActive.h"
diff --git a/plugins/WinterSpeak/src/Version.h b/plugins/WinterSpeak/src/Version.h
index 2c10081d2e..22152c74d0 100644
--- a/plugins/WinterSpeak/src/Version.h
+++ b/plugins/WinterSpeak/src/Version.h
@@ -6,8 +6,8 @@
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __PLUGIN_NAME "WinterSpeak"
-#define __FILENAME "winterspeak.dll"
-#define __DESCRIPTION "Miranda interface to the Microsoft Speech API"
+#define __FILENAME "WinterSpeak.dll"
+#define __DESCRIPTION "Miranda interface to the Microsoft Speech API."
#define __AUTHOR "Ryan Winter, BlubbFish"
#define __AUTHOREMAIL "miranda@blubbfish.net"
#define __AUTHORWEB "http://miranda-ng.org/p/WinterSpeak/"
diff --git a/plugins/WinterSpeak/src/m_speak.h b/plugins/WinterSpeak/src/m_speak.h
deleted file mode 100644
index 3c0d418012..0000000000
--- a/plugins/WinterSpeak/src/m_speak.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-#define MS_SPEAK_STATUS "Speak/Status"
-#define MS_SPEAK_MESSAGE "Speak/Message"
\ No newline at end of file
--
cgit v1.2.3