Rework InstallHeaders target to be more regular
This commit is contained in:
parent
773b60c36c
commit
59ab4cd09b
17 changed files with 121 additions and 57 deletions
|
@ -10,7 +10,6 @@
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\vendor\csri\</SrcDir>
|
<SrcDir>..\..\vendor\csri\</SrcDir>
|
||||||
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
@ -22,6 +21,9 @@
|
||||||
<PreprocessorDefinitions>CSRI_NO_EXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>CSRI_NO_EXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(SrcDir)include\;$(SrcDir)lib\;$(SrcDir)lib\win32\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SrcDir)include\;$(SrcDir)lib\;$(SrcDir)lib\win32\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\vendor\wxWidgets\src\expat\lib</SrcDir>
|
<SrcDir>..\..\vendor\wxWidgets\src\expat\lib</SrcDir>
|
||||||
<HeaderRoot>$(SrcDir)</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
@ -20,6 +19,9 @@
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -11,9 +11,6 @@
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(FfmpegSrcDir)</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
|
@ -54,6 +51,9 @@
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
<InputRelativeSourceDir>$(FfmpegSrcDir)</InputRelativeSourceDir>
|
<InputRelativeSourceDir>$(FfmpegSrcDir)</InputRelativeSourceDir>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(FfmpegSrcDir)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
<Yasm>
|
<Yasm>
|
||||||
<InputRelativeSourceDir>$(FfmpegSrcDir)\</InputRelativeSourceDir>
|
<InputRelativeSourceDir>$(FfmpegSrcDir)\</InputRelativeSourceDir>
|
||||||
</Yasm>
|
</Yasm>
|
||||||
|
@ -1073,9 +1073,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<InstallHeaderTo Include="$(MSBuildThisFileDirectory)\libavutil\avconfig.h">
|
<InstallHeader Include="$(MSBuildThisFileDirectory)\libavutil\avconfig.h">
|
||||||
<Destination>libavutil\</Destination>
|
<HeaderRoot>$(MSBuildThisFileDirectory)</HeaderRoot>
|
||||||
</InstallHeaderTo>
|
</InstallHeader>
|
||||||
|
|
||||||
<InstallHeader Include="$(FfmpegSrcDir)\libavcodec\audiodsp.h" />
|
<InstallHeader Include="$(FfmpegSrcDir)\libavcodec\audiodsp.h" />
|
||||||
<InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avcodec.h" />
|
<InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avcodec.h" />
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Ffms2PreprocessorHaalisource Condition="'$(Ffms2UseAtl)'!='0'">HAALISOURCE;</Ffms2PreprocessorHaalisource>
|
<Ffms2PreprocessorHaalisource Condition="'$(Ffms2UseAtl)'!='0'">HAALISOURCE;</Ffms2PreprocessorHaalisource>
|
||||||
<HeaderRoot>$(FfmsSrcDir)\include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
|
@ -42,6 +41,9 @@
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(FfmsSrcDir)\include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(FftwSrcDir)\api</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>
|
||||||
|
@ -41,6 +38,9 @@
|
||||||
<StructMemberAlignment>Default</StructMemberAlignment>
|
<StructMemberAlignment>Default</StructMemberAlignment>
|
||||||
<InputRelativeSourceDir>$(FftwSrcDir)</InputRelativeSourceDir>
|
<InputRelativeSourceDir>$(FftwSrcDir)</InputRelativeSourceDir>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(FftwSrcDir)\api</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(FontconfigSrcDir)</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>
|
||||||
|
@ -30,6 +27,9 @@
|
||||||
%(PreprocessorDefinitions)
|
%(PreprocessorDefinitions)
|
||||||
</PreprocessorDefinitions>
|
</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(FontconfigSrcDir)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Project References -->
|
<!-- Project References -->
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(Freetype2SrcDir)\include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(Freetype2SrcDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(Freetype2SrcDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
@ -29,6 +26,9 @@
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
<Culture>0x0409</Culture>
|
<Culture>0x0409</Culture>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(Freetype2SrcDir)\include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -54,8 +54,11 @@
|
||||||
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi-run.c" />
|
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi-run.c" />
|
||||||
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi-shape.c" />
|
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi-shape.c" />
|
||||||
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi.c" />
|
<ClCompile Include="$(FribidiSrcDir)\lib\fribidi.c" />
|
||||||
<InstallHeaderTo Include="$(FribidiSrcDir)\lib\*.h;$(MSBuildThisFileDirectory)fribidi-config.h">
|
<InstallHeader Include="$(FribidiSrcDir)\lib\*.h">
|
||||||
<Destination>fribidi\</Destination>
|
<HeaderRoot>$(FribidiSrcDir)\lib</HeaderRoot>
|
||||||
</InstallHeaderTo>
|
</InstallHeader>
|
||||||
|
<InstallHeader Include="$(MSBuildThisFileDirectory)fribidi-config.h">
|
||||||
|
<HeaderRoot>$(MSBuildThisFileDirectory)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -76,6 +76,14 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
<ItemGroup>
|
||||||
|
<InstallHeader Include="$(IcuSrcDir)\i18n\unicode\*.h">
|
||||||
|
<HeaderRoot>$(IcuSrcDir)\i18n</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
|
<InstallHeader Include="$(IcuSrcDir)\common\unicode\*.h">
|
||||||
|
<HeaderRoot>$(IcuSrcDir)\common</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(AegisubObjectDir)\$(IcuDt).c" />
|
<ClCompile Include="$(AegisubObjectDir)\$(IcuDt).c" />
|
||||||
<ClCompile Include="$(IcuSrcDir)\common\ubidi.c" />
|
<ClCompile Include="$(IcuSrcDir)\common\ubidi.c" />
|
||||||
|
@ -364,9 +372,6 @@
|
||||||
<ClInclude Include="$(IcuSrcDir)\common\uvectr32.h" />
|
<ClInclude Include="$(IcuSrcDir)\common\uvectr32.h" />
|
||||||
<ClInclude Include="$(IcuSrcDir)\common\uvectr64.h" />
|
<ClInclude Include="$(IcuSrcDir)\common\uvectr64.h" />
|
||||||
<ClInclude Include="$(IcuSrcDir)\common\wintz.h" />
|
<ClInclude Include="$(IcuSrcDir)\common\wintz.h" />
|
||||||
<InstallHeaderTo Include="$(IcuSrcDir)\common\unicode\*.h">
|
|
||||||
<Destination>unicode\</Destination>
|
|
||||||
</InstallHeaderTo>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(IcuSrcDir)\i18n\filteredbrk.cpp" />
|
<ClCompile Include="$(IcuSrcDir)\i18n\filteredbrk.cpp" />
|
||||||
|
@ -689,9 +694,6 @@
|
||||||
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_conf.h" />
|
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_conf.h" />
|
||||||
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_impl.h" />
|
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_impl.h" />
|
||||||
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_wsconf.h" />
|
<ClInclude Include="$(IcuSrcDir)\i18n\uspoof_wsconf.h" />
|
||||||
<InstallHeaderTo Include="$(IcuSrcDir)\i18n\unicode\*.h">
|
|
||||||
<Destination>unicode\</Destination>
|
|
||||||
</InstallHeaderTo>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\luajit-minilua\luajit-minilua.vcxproj">
|
<ProjectReference Include="..\luajit-minilua\luajit-minilua.vcxproj">
|
||||||
|
|
|
@ -1,27 +1,42 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<InstallHeader>
|
||||||
|
<Destination></Destination>
|
||||||
|
</InstallHeader>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
<Target
|
||||||
|
Name="ComputeHeaderOutputs"
|
||||||
|
Inputs="@(InstallHeader)"
|
||||||
|
Outputs="@(InstallHeader->'%(HeaderRoot)|%(RelativeDir)')"
|
||||||
|
BeforeTargets="InstallHeaders"
|
||||||
|
>
|
||||||
|
<CalculateOutputDir
|
||||||
|
Items="@(InstallHeader)"
|
||||||
|
SourceDir="%(HeaderRoot)"
|
||||||
|
DestinationDir="$(AegisubSourceBase)include"
|
||||||
|
>
|
||||||
|
<Output ItemName="_InstallHeader" TaskParameter="Outputs" />
|
||||||
|
</CalculateOutputDir>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<Target
|
<Target
|
||||||
Name="InstallHeaders"
|
Name="InstallHeaders"
|
||||||
BeforeTargets="ClCompile"
|
BeforeTargets="ClCompile"
|
||||||
Inputs="@(InstallHeader)"
|
Inputs="@(_InstallHeader)"
|
||||||
Outputs="@(InstallHeader->Replace($(HeaderRoot), $(AegisubSourceBase)include))"
|
Outputs="@(_InstallHeader->'%(OutputDir)%(Destination)%(Filename)%(Extension)')"
|
||||||
>
|
>
|
||||||
|
<Error
|
||||||
|
Condition="'%(_InstallHeader.OutputDir)' == ''"
|
||||||
|
Text="OutputDir for _InstallHeader item is blank, problem during ComputeHeaderOutputs target?"
|
||||||
|
/>
|
||||||
<Copy
|
<Copy
|
||||||
SourceFiles="@(InstallHeader)"
|
SourceFiles="@(_InstallHeader)"
|
||||||
DestinationFiles="@(InstallHeader->Replace($(HeaderRoot), $(AegisubSourceBase)include))"
|
DestinationFiles="@(_InstallHeader->'%(OutputDir)%(Destination)%(Filename)%(Extension)')"
|
||||||
SkipUnchangedFiles="true"
|
|
||||||
/>
|
|
||||||
</Target>
|
|
||||||
<Target
|
|
||||||
Name="InstallHeadersTo"
|
|
||||||
BeforeTargets="ClCompile"
|
|
||||||
Inputs="@(InstallHeaderTo)"
|
|
||||||
Outputs="@(InstallHeaderTo -> '$(AegisubSourceBase)include\%(Destination)%(Filename)%(Extension)')"
|
|
||||||
>
|
|
||||||
<Copy
|
|
||||||
SourceFiles="@(InstallHeaderTo)"
|
|
||||||
DestinationFiles="@(InstallHeaderTo -> '$(AegisubSourceBase)include\%(Destination)%(Filename)%(Extension)')"
|
|
||||||
SkipUnchangedFiles="true"
|
SkipUnchangedFiles="true"
|
||||||
/>
|
/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -29,15 +29,16 @@
|
||||||
%(PreprocessorDefinitions)
|
%(PreprocessorDefinitions)
|
||||||
</PreprocessorDefinitions>
|
</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<InstallHeaderTo>
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(LibassSrcDir)\libass</HeaderRoot>
|
||||||
<Destination>ass\</Destination>
|
<Destination>ass\</Destination>
|
||||||
</InstallHeaderTo>
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<InstallHeaderTo Include="$(LibassSrcDir)\libass\ass.h" />
|
<InstallHeader Include="$(LibassSrcDir)\libass\ass.h" />
|
||||||
<InstallHeaderTo Include="$(LibassSrcDir)\libass\ass_types.h" />
|
<InstallHeader Include="$(LibassSrcDir)\libass\ass_types.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="$(LibassSrcDir)\libass\ass.h" />
|
<ClInclude Include="$(LibassSrcDir)\libass\ass.h" />
|
||||||
|
|
|
@ -15,15 +15,15 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(SrcDir)\include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(SrcDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SrcDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<CompileAs>CompileAsC</CompileAs>
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\vendor\wxWidgets\src\png\</SrcDir>
|
<SrcDir>..\..\vendor\wxWidgets\src\png\</SrcDir>
|
||||||
<HeaderRoot>$(SrcDir)</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
@ -21,6 +20,12 @@
|
||||||
<Project>{10f22a5a-dd9e-44a1-ba2e-2a9a7c78b0ee}</Project>
|
<Project>{10f22a5a-dd9e-44a1-ba2e-2a9a7c78b0ee}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
<!-- Project specific configuration -->
|
<!-- Project specific configuration -->
|
||||||
<PropertyGroup>
|
|
||||||
<HeaderRoot>$(SrcDir)\include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>
|
<PreprocessorDefinitions>
|
||||||
|
@ -27,6 +24,9 @@
|
||||||
</PreprocessorDefinitions>
|
</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>$(AegisubObjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(AegisubObjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<!-- BuildVM stuff -->
|
<!-- BuildVM stuff -->
|
||||||
|
|
|
@ -5,5 +5,31 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<UsingTask TaskName="GitVersion" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
|
<UsingTask TaskName="GitVersion" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
|
||||||
|
|
||||||
|
<UsingTask TaskName="CalculateOutputDir" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
|
||||||
|
<ParameterGroup>
|
||||||
|
<Items ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
|
||||||
|
<SourceDir Required="true" />
|
||||||
|
<DestinationDir Required="true" />
|
||||||
|
<Outputs ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true" />
|
||||||
|
</ParameterGroup>
|
||||||
|
<Task>
|
||||||
|
<Code Type="Fragment" Language="cs"><![CDATA[
|
||||||
|
Outputs = new TaskItem[Items.Length];
|
||||||
|
char[] backslash = new char[] {'\\'};
|
||||||
|
var srcdir = SourceDir.Replace('/', '\\').TrimEnd(backslash) + "\\";
|
||||||
|
var dstdir = DestinationDir.Replace('/', '\\').TrimEnd(backslash) + "\\";
|
||||||
|
int i = 0;
|
||||||
|
foreach (var item in Items) {
|
||||||
|
var itemDir = item.GetMetadata("RelativeDir"); // the dir specified in the item Include= attribute
|
||||||
|
var outputDir = itemDir.Replace(srcdir, dstdir).Replace('/', '\\').TrimEnd(backslash) + "\\";
|
||||||
|
var output = new TaskItem(item);
|
||||||
|
((ITaskItem2)output).SetMetadataValueLiteral("OutputDir", outputDir);
|
||||||
|
Outputs[i] = output;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
]]></Code>
|
||||||
|
</Task>
|
||||||
|
</UsingTask>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\vendor\wxWidgets\</SrcDir>
|
<SrcDir>..\..\vendor\wxWidgets\</SrcDir>
|
||||||
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
@ -23,6 +22,9 @@
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<InstallHeader>
|
||||||
|
<HeaderRoot>$(SrcDir)include</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<Target Name="InstallSetup"
|
<Target Name="InstallSetup"
|
||||||
|
|
|
@ -20,8 +20,12 @@
|
||||||
|
|
||||||
<!-- Source files -->
|
<!-- Source files -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<InstallHeaderTo Include="$(ZlibSrcDir)\zlib.h" />
|
<InstallHeader Include="$(ZlibSrcDir)\zlib.h">
|
||||||
<InstallHeaderTo Include="$(MSBuildThisFileDirectory)\zconf.h" />
|
<HeaderRoot>$(ZlibSrcDir)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
|
<InstallHeader Include="$(MSBuildThisFileDirectory)\zconf.h">
|
||||||
|
<HeaderRoot>$(MSBuildThisFileDirectory)</HeaderRoot>
|
||||||
|
</InstallHeader>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(ZlibSrcDir)\adler32.c" />
|
<ClCompile Include="$(ZlibSrcDir)\adler32.c" />
|
||||||
|
|
Loading…
Reference in a new issue