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

Remove explicit references to libraries and use project references instead

Browse source
This commit is contained in:
Thomas Goyne 2012-11-01 07:40:09 -07:00
parent fc7d50dfb5
commit c2510b1ef0
2 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
aegisub/build/Aegisub/Aegisub.targets
View file

@ -73,7 +73,7 @@
<SubWCRev Include="$(AegisubSourceBase)build\svn-revision-base.h" /> <SubWCRev Include="$(AegisubSourceBase)build\svn-revision-base.h" />
</ItemGroup> </ItemGroup>
<!-- Create build configuration file if it does not exist-target --> <!-- Create build configuration file if it does not exist-target -->
<Target <Target
Name="CreateDefaultConfigurationHeader" Name="CreateDefaultConfigurationHeader"
@ -101,8 +101,8 @@
Text="Created %(CreateDefaultConfigurationHeader.TargetFile)" Text="Created %(CreateDefaultConfigurationHeader.TargetFile)"
/> />
</Target> </Target>
<!-- Default configuration --> <!-- Default configuration -->
<Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" /> <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
@ -116,7 +116,7 @@
<PreprocessorDefinitions>BUILD_CREDIT="$(AegisubBuildCredit)";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BUILD_CREDIT="$(AegisubBuildCredit)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Skip config_windows.h support --> <!-- Skip config_windows.h support -->
<ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'"> <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
<ClCompile> <ClCompile>
@ -130,39 +130,30 @@
<TargetFile>$(AegisubSourceBase)src\config\config_windows.h</TargetFile> <TargetFile>$(AegisubSourceBase)src\config\config_windows.h</TargetFile>
</CreateDefaultConfigurationHeader> </CreateDefaultConfigurationHeader>
</ItemGroup> </ItemGroup>
<!-- Automation Lua support --> <!-- Automation Lua support -->
<ItemDefinitionGroup Condition="'$(AegisubUseAutomationLua)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseAutomationLua)'=='true'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link>
<AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Hunspell support --> <!-- Hunspell support -->
<ItemDefinitionGroup Condition="'$(AegisubUseHunspell)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseHunspell)'=='true'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link>
<AdditionalDependencies>hunspell.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- CSRI helper library support --> <!-- CSRI helper library support -->
<ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='HelperLibrary'"> <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='HelperLibrary'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link>
<AdditionalDependencies>csrihelper.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- CSRI external library support --> <!-- CSRI external library support -->
<ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='External'"> <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='External'">
<ClCompile> <ClCompile>
@ -173,7 +164,7 @@
<AdditionalDependencies>$(CsriLibraryName);%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(CsriLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- libass support --> <!-- libass support -->
<ItemDefinitionGroup Condition="'$(AegisubUseLibass)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseLibass)'=='true'">
<ClCompile> <ClCompile>
@ -197,7 +188,7 @@
<AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- FFmpegSource support --> <!-- FFmpegSource support -->
<ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
<ClCompile> <ClCompile>
@ -209,14 +200,14 @@
<AdditionalDependencies>$(FFmpegSourceLibraryName);%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(FFmpegSourceLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Avisynth support --> <!-- Avisynth support -->
<ItemDefinitionGroup Condition="'$(AegisubUseAvisynth)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseAvisynth)'=='true'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AVISYNTH;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AVISYNTH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- FFTW support --> <!-- FFTW support -->
<ItemDefinitionGroup Condition="'$(AegisubUseFftw)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseFftw)'=='true'">
<ClCompile> <ClCompile>
@ -253,7 +244,7 @@
<ItemGroup Condition="'$(AegisubUseDSound)'=='true'"> <ItemGroup Condition="'$(AegisubUseDSound)'=='true'">
<AegisubCheckDirectXSDK Include="dsound" /> <AegisubCheckDirectXSDK Include="dsound" />
</ItemGroup> </ItemGroup>
<!-- Special builds --> <!-- Special builds -->
<ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'"> <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
<ClCompile> <ClCompile>
@ -261,7 +252,7 @@
<PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='StartupLog'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='StartupLog'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- General configuration, always required libraries --> <!-- General configuration, always required libraries -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
@ -274,18 +265,7 @@
%(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link>
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>
libiconv.lib;
libresrc.lib;
libaegisub.lib;
universalchardet.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Add property pages --> <!-- Add property pages -->
<ItemGroup> <ItemGroup>

23
aegisub/build/Aegisub/Aegisub.vcxproj
View file

@ -423,4 +423,27 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="$(SrcDir)res.rc" /> <ResourceCompile Include="$(SrcDir)res.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
<Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project>
</ProjectReference>
<ProjectReference Include="..\hunspell\hunspell.vcxproj">
<Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
</ProjectReference>
<ProjectReference Include="..\libaegisub\libaegisub.vcxproj">
<Project>{bb3fed86-db7a-4dc7-964a-260fb86cde61}</Project>
</ProjectReference>
<ProjectReference Include="..\libiconv\libiconv.vcxproj">
<Project>{965054d2-44f2-4eb2-9879-051cc3d7ef08}</Project>
</ProjectReference>
<ProjectReference Include="..\libresrc\libresrc.vcxproj">
<Project>{bd00d65f-24da-4784-8860-3b972ea125fc}</Project>
</ProjectReference>
<ProjectReference Include="..\lua51\lua51.vcxproj">
<Project>{5391a8b1-9c70-4dc4-92ad-d3e34c6b803f}</Project>
</ProjectReference>
<ProjectReference Include="..\universalchardet\universalchardet.vcxproj">
<Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
</ProjectReference>
</ItemGroup>
</Project> </Project>