[build] fix windows 10 build errors. (kaldi-asr#4111)

https://groups.google.com/forum/#!topic/kaldi-help/ELCQy5-uKKo
goodatlas · Jun 17, 2020 · 97438b0 · 97438b0
1 parent 8910533
commit 97438b0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 9 deletions.
diff --git a/windows/generate_solution.pl b/windows/generate_solution.pl
@@ -35,17 +35,20 @@
 
 my %TOOLS=( default=> "14.1",
             vs2015 => "14.0",
-            vs2017 => "14.1"
+            vs2017 => "14.1",
+            vs2019 => "v14.2"
             );
 
 my %FORMAT=( default=> "14.10",
              vs2015 =>  "14.00",
-             vs2017 =>  "14.10"
+             vs2017 =>  "14.10",
+             vs2019 => "v14.20"
              );
 
 my %TOOLSET=( default=> "v141",
               vs2015 => "v140",
-              vs2017 => "v141"
+              vs2017 => "v141",
+              vs2019 => "v142"
               );
 
 
@@ -85,7 +88,8 @@
   "$Bin/openfstwin_release.props",
   "$Bin/openfstwin_debug_win32.props",
   "$Bin/openfstwin_release_win32.props",
-  "$Bin/portaudio.props",
+  "$Bin/portaudio_release.props",
+  "$Bin/portaudio_debug.props"
 );
 
 my %optionalProps = (
@@ -535,7 +539,7 @@ sub writeProjectFiles {
   print PROJ
 "    <Import Project=\"..\\kaldiwin_win32.props\" />
     <Import Project=\"..\\openfstwin_debug_win32.props\" />
-    <Import Project=\"..\\portaudio.props\" />
+    <Import Project=\"..\\portaudio_debug.props\" />
   </ImportGroup>
   <ImportGroup Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|x64'\" Label=\"PropertySheets\">
     <Import Project=\"..\\variables.props\" />
@@ -549,7 +553,7 @@ sub writeProjectFiles {
   print PROJ
 "    <Import Project=\"..\\kaldiwin.props\" />
     <Import Project=\"..\\openfstwin_debug.props\" />
-    <Import Project=\"..\\portaudio.props\" />
+    <Import Project=\"..\\portaudio_debug.props\" />
   </ImportGroup>
   <ImportGroup Condition=\"'\$(Configuration)|\$(Platform)'=='Release|Win32'\" Label=\"PropertySheets\">
     <Import Project=\"..\\variables.props\" />
@@ -563,7 +567,7 @@ sub writeProjectFiles {
   print PROJ
 "    <Import Project=\"..\\kaldiwin_win32.props\" />
     <Import Project=\"..\\openfstwin_release_win32.props\" />
-    <Import Project=\"..\\portaudio.props\" />
+    <Import Project=\"..\\portaudio_release.props\" />
   </ImportGroup>
   <ImportGroup Condition=\"'\$(Configuration)|\$(Platform)'=='Release|x64'\" Label=\"PropertySheets\">
     <Import Project=\"..\\variables.props\" />
@@ -577,7 +581,7 @@ sub writeProjectFiles {
   print PROJ
 "    <Import Project=\"..\\kaldiwin.props\" />
     <Import Project=\"..\\openfstwin_release.props\" />
-    <Import Project=\"..\\portaudio.props\" />
+    <Import Project=\"..\\portaudio_release.props\" />
   </ImportGroup>
 ";
 

diff --git a/windows/portaudio_debug.props b/windows/portaudio_debug.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental>
+    </LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(PORTAUDIO)\src\common;$(PORTAUDIO)\src\os\win;$(PORTAUDIO)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(PORTAUDIOLIB)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>portaudio_static_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/windows/portaudio_release.props b/windows/portaudio_release.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental>
+    </LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(PORTAUDIO)\src\common;$(PORTAUDIO)\src\os\win;$(PORTAUDIO)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(PORTAUDIOLIB)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>portaudio_static_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/windows/variables.props.dev b/windows/variables.props.dev
@@ -10,7 +10,7 @@
     <OPENFSTLIB>C:\Users\jtrmal\Documents\openfst\build64</OPENFSTLIB>
     <CUBDIR>c:\Users\jtrmal\Documents\cub\</CUBDIR>
     <PORTAUDIO>W:\kaldi-build\portaudio_src_double</PORTAUDIO>
-    <PORTAUDIOLIB>W:\kaldi-build\portaudio_src_double\Debug</PORTAUDIOLIB>
+    <PORTAUDIOLIB>W:\kaldi-build\portaudio_src_double</PORTAUDIOLIB>
     <NVTOOLSDIR>C:\Program FIles\NVIDIA Corporation\NvToolsExt\</NVTOOLSDIR>
     <!-- Do not modify anything after this line -->
   </PropertyGroup>