diff --git a/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets index 07f0e5de3a02b5d22449015b016b8f12c399fbf4..438a7790b4811ae3180a617b6d0db3fa8849b860 100644 --- a/build/Aegisub/Aegisub.targets +++ b/build/Aegisub/Aegisub.targets @@ -146,7 +146,6 @@ </PreprocessorDefinitions> <AdditionalIncludeDirectories> $(SrcDir)include\; - $(AegisubContribBase)iconv\include; $(AegisubSourceBase)libaegisub\include; $(AegisubSourceBase)build; $(AegisubSourceBase)include; diff --git a/build/boost/boost.vcxproj b/build/boost/boost.vcxproj index 7af7d369b40d2a4c7b3d2ccbd83a7ebc55d51275..f708057d9b5e6f6c88fd77aecdcfedd37dc326aa 100644 --- a/build/boost/boost.vcxproj +++ b/build/boost/boost.vcxproj @@ -25,10 +25,6 @@ BOOST_THREAD_BUILD_LIB; %(PreprocessorDefinitions) </PreprocessorDefinitions> - <AdditionalIncludeDirectories> - $(AegisubContribBase)iconv\include; - %(AdditionalIncludeDirectories) - </AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> diff --git a/build/csrihelper/csrihelper.vcxproj b/build/csrihelper/csrihelper.vcxproj index 93fb6a0372c7278802d355502b6ca3fe7f034a3f..4f9ff8290f68c9864a7e2ebcc551e10166ddbdc1 100644 --- a/build/csrihelper/csrihelper.vcxproj +++ b/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" /> diff --git a/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj index a73a35119c115726c8301bf458789ff06daf50e3..3c2aef4ddd4b5e1e717a0cecd07319039a99346d 100644 --- a/build/libaegisub/libaegisub.vcxproj +++ b/build/libaegisub/libaegisub.vcxproj @@ -18,7 +18,6 @@ <AdditionalIncludeDirectories> $(SrcDir); $(SrcDir)include; - $(AegisubContribBase)iconv\include; %(AdditionalIncludeDirectories) </AdditionalIncludeDirectories> <PreprocessorDefinitions> diff --git a/build/libass/libass.vcxproj b/build/libass/libass.vcxproj index 23b78747a557d1cb8abc9abece466eb8dac322f6..282aeb2d58591b377b1658372efa4727afb09c76 100644 --- a/build/libass/libass.vcxproj +++ b/build/libass/libass.vcxproj @@ -21,7 +21,6 @@ $(LibassSrcDir)\libass; $(MSBuildThisFileDirectory); $(AegisubSourceBase)\include\fribidi; - $(AegisubContribBase)iconv\include; %(AdditionalIncludeDirectories) </AdditionalIncludeDirectories> <PreprocessorDefinitions> diff --git a/build/libiconv/libiconv.vcxproj b/build/libiconv/libiconv.vcxproj index c86b91668243e97e0c0eea70c3cdcc05985c8c06..cc2e00d28ae1591348139e6f03614e6c9329b8d1 100644 --- a/build/libiconv/libiconv.vcxproj +++ b/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" /> diff --git a/src/subtitles_provider_csri.cpp b/src/subtitles_provider_csri.cpp index 3bf710f37f0b496308f0fff1e9965e31486f7d8a..dffd5bd3a85c4c84238e67ddc3df125d96865949 100644 --- a/src/subtitles_provider_csri.cpp +++ b/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;