Build the Visual Studio 2015 Windows project with pcaudiolib xaudio2 support.

This commit is contained in:
Reece H. Dunn
2016-02-13 18:34:16 +00:00
parent e4daa18d2f
commit b7b2567eb1
5 changed files with 42 additions and 9 deletions
+2
View File
@@ -56,6 +56,8 @@ espeak-ng.pc
# Windows builds
src/pcaudiolib/
!src/windows/config.h
*.obj
+3 -1
View File
@@ -166,7 +166,9 @@ To build eSpeak NG on Windows, you will need:
1. a copy of Visual Studio 2015, such as the Community Edition;
2. the Windows 8.1 SDK;
3. the [WiX installer](http://wixtoolset.org) plugin.
3. the [WiX installer](http://wixtoolset.org) plugin;
4. the [pcaudiolib](http://github.com/rhdunn/pcaudiolib) project checked out to
`src` (as `src/pcaudiolib`).
You can then open and build the `src/windows/espeak-ng.sln` solution in Visual
Studio.
+2
View File
@@ -116,7 +116,9 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
if (out_samplerate != 0) {
// sound was previously open with a different sample rate
audio_object_close(my_audio);
#ifdef HAVE_SLEEP
sleep(1);
#endif
}
#endif
out_samplerate = voice_samplerate;
+17 -8
View File
@@ -87,14 +87,15 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>libespeak-ng.def</ModuleDefinitionFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -103,14 +104,15 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>libespeak-ng.def</ModuleDefinitionFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -121,8 +123,8 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>
@@ -131,6 +133,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>libespeak-ng.def</ModuleDefinitionFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -141,9 +144,9 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -151,6 +154,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>libespeak-ng.def</ModuleDefinitionFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -177,6 +181,9 @@
<ClCompile Include="..\libespeak-ng\tr_languages.c" />
<ClCompile Include="..\libespeak-ng\voices.c" />
<ClCompile Include="..\libespeak-ng\wavegen.c" />
<ClCompile Include="..\pcaudiolib\src\audio.c" />
<ClCompile Include="..\pcaudiolib\src\windows.c" />
<ClCompile Include="..\pcaudiolib\src\xaudio2.cpp" />
<ClCompile Include="com\comentrypoints.c" />
<ClCompile Include="com\ttsengine.cpp" />
</ItemGroup>
@@ -193,6 +200,8 @@
<ClInclude Include="..\libespeak-ng\synthesize.h" />
<ClInclude Include="..\libespeak-ng\translate.h" />
<ClInclude Include="..\libespeak-ng\voice.h" />
<ClInclude Include="..\pcaudiolib\src\audio_priv.h" />
<ClInclude Include="..\pcaudiolib\src\include\pcaudiolib\audio.h" />
<ClInclude Include="config.h" />
</ItemGroup>
<ItemGroup>
+18
View File
@@ -19,6 +19,9 @@
<Filter Include="Source Files\com">
<UniqueIdentifier>{77d943b9-0670-4e38-b6ad-592ad6c85094}</UniqueIdentifier>
</Filter>
<Filter Include="pcaudiolib">
<UniqueIdentifier>{2e01ca9c-ccf8-4acf-b2aa-0ac89b34fc31}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libespeak-ng\compiledata.c">
@@ -96,6 +99,15 @@
<ClCompile Include="com\ttsengine.cpp">
<Filter>Source Files\com</Filter>
</ClCompile>
<ClCompile Include="..\pcaudiolib\src\audio.c">
<Filter>pcaudiolib</Filter>
</ClCompile>
<ClCompile Include="..\pcaudiolib\src\windows.c">
<Filter>pcaudiolib</Filter>
</ClCompile>
<ClCompile Include="..\pcaudiolib\src\xaudio2.cpp">
<Filter>pcaudiolib</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="config.h">
@@ -137,6 +149,12 @@
<ClInclude Include="..\libespeak-ng\mbrowrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\pcaudiolib\src\audio_priv.h">
<Filter>pcaudiolib</Filter>
</ClInclude>
<ClInclude Include="..\pcaudiolib\src\include\pcaudiolib\audio.h">
<Filter>pcaudiolib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="libespeak-ng.def">