Install CSRI and iconv headers rather than mucking about with include paths

build/Aegisub/Aegisub.targets

@@ -146,7 +146,6 @@
       </PreprocessorDefinitions>
       <AdditionalIncludeDirectories>
         $(SrcDir)include\;
-        $(AegisubContribBase)iconv\include;
         $(AegisubSourceBase)libaegisub\include;
         $(AegisubSourceBase)build;
         $(AegisubSourceBase)include;

build/boost/boost.vcxproj

@@ -25,10 +25,6 @@
         BOOST_THREAD_BUILD_LIB;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>
-        $(AegisubContribBase)iconv\include;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
 

build/csrihelper/csrihelper.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{C832EAF3-860D-4373-A02C-933626B47A5E}</ProjectGuid>
     <RootNamespace>csrihelper</RootNamespace>
   </PropertyGroup>
+
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
@@ -13,6 +14,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
+
   <!-- Project specific configuration -->
   <ItemDefinitionGroup>
     <ClCompile>
@@ -20,7 +22,13 @@
       <AdditionalIncludeDirectories>$(SrcDir)include\;$(SrcDir)lib\;$(SrcDir)lib\win32\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
+
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(SrcDir)\include\csri\*.h">
+      <Destination>csri\</Destination>
+    </InstallHeader>
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SrcDir)include\csri\csri.h" />
     <ClInclude Include="$(SrcDir)include\csri\fmtids.h" />

build/libaegisub/libaegisub.vcxproj

@@ -18,7 +18,6 @@
       <AdditionalIncludeDirectories>
         $(SrcDir);
         $(SrcDir)include;
-        $(AegisubContribBase)iconv\include;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>

build/libass/libass.vcxproj

@@ -21,7 +21,6 @@
         $(LibassSrcDir)\libass;
         $(MSBuildThisFileDirectory);
         $(AegisubSourceBase)\include\fribidi;
-        $(AegisubContribBase)iconv\include;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>

build/libiconv/libiconv.vcxproj

@@ -4,6 +4,7 @@
     <ProjectGuid>{965054D2-44F2-4EB2-9879-051CC3D7EF08}</ProjectGuid>
     <RootNamespace>libiconv</RootNamespace>
   </PropertyGroup>
+
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
@@ -12,6 +13,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
+
   <!-- Project specific configuration -->
   <ItemDefinitionGroup>
     <ClCompile>
@@ -20,7 +22,11 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
   </ItemDefinitionGroup>
+
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(SrcDir)\include\iconv.h" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SrcDir)include\iconv.h" />
     <ClInclude Include="$(SrcDir)include\libcharset.h" />

src/subtitles_provider_csri.cpp

@@ -49,11 +49,10 @@
 
 #ifdef WIN32
 #define CSRIAPI
-#include "../../contrib/csri/include/csri/csri.h"
-#else
-#include <csri/csri.h>
 #endif
 
+#include <csri/csri.h>
+
 // CSRI renderers are not required to be thread safe (and VSFilter very much
 // is not)
 static std::mutex csri_mutex;