mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Thomas Goyne 2014-03-11 12:11:05 -07:00
parent 1745177b6c
commit 409eee4510
7 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/Aegisub/Aegisub.targets
View file

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

4
build/boost/boost.vcxproj
View file

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

8
build/csrihelper/csrihelper.vcxproj
View file

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

1
build/libaegisub/libaegisub.vcxproj
View file

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

1
build/libass/libass.vcxproj
View file

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

6
build/libiconv/libiconv.vcxproj
View file

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

5
src/subtitles_provider_csri.cpp
View file

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