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

Prettify the property files a bit and add some real sample files for the userconfig dir.

Browse source 
Originally committed to SVN as r5161.
This commit is contained in:
Niels Martin Hansen 2011-01-10 17:46:15 +00:00
parent 5f7fbf48c6
commit 0d6edabbdc
9 changed files with 197 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
aegisub/build/msbuild/ft2.props
View file

@ -1,13 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Include and link Freetype 2 based on some user properties --> <PropertyGroup>
<PropertyGroup> <_PropertySheetDisplayName>Freetype 2 support</_PropertySheetDisplayName>
<IncludePath>$(Ft2IncludePath);$(IncludePath)</IncludePath> </PropertyGroup>
<LibraryPath>$(Ft2LibraryPath);$(LibraryPath)</LibraryPath>
</PropertyGroup> <!-- Include and link Freetype 2 based on some user properties -->
<ItemDefinitionGroup> <PropertyGroup>
<Link> <IncludePath>$(Ft2IncludePath);$(IncludePath)</IncludePath>
<AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies> <LibraryPath>$(Ft2LibraryPath);$(LibraryPath)</LibraryPath>
</Link> </PropertyGroup>
</ItemDefinitionGroup> <ItemDefinitionGroup>
<Link>
<AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project> </Project>

4
aegisub/build/msbuild/paths.props
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Aegisub build path definitions</_PropertySheetDisplayName>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Base for Aegisub source code --> <!-- Base for Aegisub source code -->
<AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$(MSBuildThisFileDirectory)..\..\</AegisubSourceBase> <AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$(MSBuildThisFileDirectory)..\..\</AegisubSourceBase>

48
aegisub/build/msbuild/standard-outdirs.props
View file

@ -1,25 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<OutDir Condition="'$(ConfigurationType)'=='DynamicLibrary'">$(AegisubBinaryDir)</OutDir> <_PropertySheetDisplayName>Aegisub build output directories</_PropertySheetDisplayName>
<OutDir Condition="'$(ConfigurationType)'=='Application'">$(AegisubBinaryDir)</OutDir> </PropertyGroup>
<OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(AegisubLibraryDir)</OutDir>
<IntDir>$(AegisubObjectDir)</IntDir> <PropertyGroup>
<TargetName Condition="'$(ConfigurationType)'=='DynamicLibrary'">$(ProjectName)_$(AegisubPlatformSuffix)</TargetName> <OutDir Condition="'$(ConfigurationType)'=='DynamicLibrary'">$(AegisubBinaryDir)</OutDir>
<TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)_$(AegisubPlatformSuffix)</TargetName> <OutDir Condition="'$(ConfigurationType)'=='Application'">$(AegisubBinaryDir)</OutDir>
<TargetName Condition="'$(ConfigurationType)'=='StaticLibrary'">$(ProjectName)</TargetName> <OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(AegisubLibraryDir)</OutDir>
</PropertyGroup> <IntDir>$(AegisubObjectDir)</IntDir>
<ItemDefinitionGroup> <TargetName Condition="'$(ConfigurationType)'=='DynamicLibrary'">$(ProjectName)_$(AegisubPlatformSuffix)</TargetName>
<ClCompile> <TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)_$(AegisubPlatformSuffix)</TargetName>
<ObjectFileName>$(IntDir)</ObjectFileName> <TargetName Condition="'$(ConfigurationType)'=='StaticLibrary'">$(ProjectName)</TargetName>
</ClCompile> </PropertyGroup>
<Link> <ItemDefinitionGroup>
<OutputFile>$(AegisubBinaryDir)$(TargetName)$(TargetExt)</OutputFile> <ClCompile>
<ProgramDatabaseFile>$(AegisubBinaryDir)$(TargetName).pdb</ProgramDatabaseFile> <ObjectFileName>$(IntDir)</ObjectFileName>
<ImportLibrary>$(AegisubLibraryDir)$(ProjectName).lib</ImportLibrary> </ClCompile>
</Link> <Link>
<Lib> <OutputFile>$(AegisubBinaryDir)$(TargetName)$(TargetExt)</OutputFile>
<OutputFile>$(AegisubLibraryDir)$(ProjectName).lib</OutputFile> <ProgramDatabaseFile>$(AegisubBinaryDir)$(TargetName).pdb</ProgramDatabaseFile>
</Lib> <ImportLibrary>$(AegisubLibraryDir)$(ProjectName).lib</ImportLibrary>
</ItemDefinitionGroup> </Link>
<Lib>
<OutputFile>$(AegisubLibraryDir)$(ProjectName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
</Project> </Project>

86
aegisub/build/msbuild/standard-settings.props
View file

@ -1,47 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)'=='Debug'"> <PropertyGroup>
<LinkIncremental>true</LinkIncremental> <_PropertySheetDisplayName>Aegisub build compiler settings</_PropertySheetDisplayName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup> <PropertyGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile> <LinkIncremental>true</LinkIncremental>
<MultiProcessorCompilation>true</MultiProcessorCompilation> </PropertyGroup>
<MinimalRebuild>false</MinimalRebuild> <PropertyGroup Condition="'$(Configuration)'=='Release'">
<WarningLevel>Level3</WarningLevel> <LinkIncremental>false</LinkIncremental>
<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </PropertyGroup>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
<TerminalServerAware Condition="'$(ConfigurationType'=='Application'">true</TerminalServerAware>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel>
</ClCompile> <PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ItemDefinitionGroup> </ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
<TerminalServerAware Condition="'$(ConfigurationType'=='Application'">true</TerminalServerAware>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
</Project> </Project>

24
aegisub/build/msbuild/userconfig/ft2.props.sample Normal file
View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Sample build customisation file for Aegisub.
Use this file as a template for configuring the location of the
Freetype 2 library for the Aegisub build system.
To use this file, copy it and rename the copy to *.props.
-->
<PropertyGroup Label="UserMacros">
<!-- Ft2IncludePath defines where the Freetype 2 include files are found -->
<Ft2IncludePath>C:\Dev\freetype-2.4.3\include</Ft2IncludePath>
<!-- Ft2LibraryPath defines where the Freetype 2 library files are found -->
<Ft2LibraryPath>C:\Dev\freetype-2.4.3\objs\win32\vc2010</Ft2LibraryPath>
<!-- Ft2LibraryName defines the name of the library to use for linking Freetype 2.
This will often be conditional on platform and configuration. -->
<Ft2LibraryName Condition="'$(Platform)|$(Configuration)'=='Win32|Debug'" >freetype2.4.3_32d.lib</Ft2LibraryName>
<Ft2LibraryName Condition="'$(Platform)|$(Configuration)'=='Win32|Release'">freetype2.4.3_32.lib</Ft2LibraryName>
<Ft2LibraryName Condition="'$(Platform)|$(Configuration)'=='x64|Debug'" >freetype2.4.3_64d.lib</Ft2LibraryName>
<Ft2LibraryName Condition="'$(Platform)|$(Configuration)'=='x64|Release'" >freetype2.4.3_64.lib</Ft2LibraryName>
</PropertyGroup>
</Project>

20
aegisub/build/msbuild/userconfig/paths.props.sample Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Sample build customisation file for Aegisub.
This file shows how you can control where the build system places
produced files by overriding the properties defined by paths.props.
Most people will not need this.
To use this file, copy it and rename the copy to *.props.
-->
<PropertyGroup Label="UserMacros">
<!-- Base directory for placing built files in -->
<AegisubOutputBase>C:\Dev\Aegisub\BuildFiles\</AegisubSourceBase>
<!-- Executable files are placed here, essentially creating an installation -->
<AegisubBinaryDir>C:\Dev\Aegisub\BuiltBinaries\$(Platform)\</AegisubContribBase>
</PropertyGroup>
</Project>

44
aegisub/build/msbuild/userconfig/readme.txt
View file

@ -1,44 +1,12 @@
You can put MSBuild property files in this folder to override the default You can put MSBuild property files in this folder to override the default
build configuration for Aegisub's build system. build configuration for Aegisub's build system.
There is one configuration you almost guaranteed will want to override, A number of sample files are provided. These can be copied and used as
this is for the location of wxWidgets. Here is an example of a property templates for common configuration. Importantly, configuring the location
file that specifies a wxWidgets location: of several library dependencies.
The copied sample files should be renamed to *.props, otherwise they will
-------------- mywx.props -------------- not be found by the build system.
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Set a helper property, to make the remaining property definitions shorter.
The WxBasePath property is not used by Aegisub's build system. -->
<WxBasePath>G:\Dev\wxWidgets-2.9\install-vc10</WxBasePath>
<!-- Specify WxLibraryPath, the location where the link libraries for wxWidgets
are located. The location depends on the Platform variable.
These library paths are also used to deduce the location of the configuration
header file for the specific builds. -->
<WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
<WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
<!-- Specify where the wxWidgets include files are found. -->
<WxIncludePath>$(WxBasePath)\include</WxIncludePath>
</PropertyGroup>
</Project>
----------------------------------------
You should not check files placed in this folder into source control. You should not check files placed in this folder into source control.
Files must be named *.props to be used. Files must be named *.props to be found by the build system.
Other properties of interest:
Ft2IncludePath - Path to Freetype2 include files
Ft2LibraryPath - Path to Freetype2 lib files
Ft2LibraryName - Name of Freetype2 library to link
These may be useful to override in some cases, but the defaults should be fine for most:
AegisubOutputBase - Base directory for output files from compilation, defaults to solution file location
AegisubBinaryDir - Where executables are placed, derived from AegisubOutputBase by default
AegisubLibraryDir - Where lib files are placed, derived from AegisubOutputBase by default
AegisubObjectDir - Where intermediary files are placed, derived from AegisubOutputBase by default

22
aegisub/build/msbuild/userconfig/wx.props.sample Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Sample build customisation file for Aegisub.
Use this file as a template for configuring the location of wxWidgets
for the Aegisub build system.
To use this file, copy it and rename the copy to *.props.
-->
<PropertyGroup Label="UserMacros">
<!-- Helper property, defines the base directory for wxWidgets -->
<WxBasePath>C:\Dev\wxWidgets-2.9\install-vc10</WxBasePath>
<!-- WxLibraryPath defines the location of the wxWidgets .lib files.
Two conditional values are given, depending on the platform. -->
<WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
<WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
<!-- WxIncludePath defines the location of the wxWidgets include files. -->
<WxIncludePath>$(WxBasePath)\include</WxIncludePath>
</PropertyGroup>
</Project>

70
aegisub/build/msbuild/wx.props
View file

@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Some helper affixes --> <PropertyGroup>
<PropertyGroup> <_PropertySheetDisplayName>wxWidgets support</_PropertySheetDisplayName>
<WxLibDbgSuffix Condition="'$(Configuration)'=='Debug'">d</WxLibDbgSuffix> </PropertyGroup>
<WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix>
<WxLibBase>wxbase29u$(WxLibDbgSuffix)</WxLibBase> <!-- Some helper affixes -->
<WxLibMsw>wxmsw29u$(WxLibDbgSuffix)</WxLibMsw> <PropertyGroup>
</PropertyGroup> <WxLibDbgSuffix Condition="'$(Configuration)'=='Debug'">d</WxLibDbgSuffix>
<WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix>
<!-- Tell the compiler where to search for wx headers and libraries --> </PropertyGroup>
<PropertyGroup>
<IncludePath>$(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)</IncludePath> <!-- Tell the compiler where to search for wx headers and libraries -->
<LibraryPath>$(WxLibraryPath);$(LibraryPath)</LibraryPath> <PropertyGroup>
</PropertyGroup> <IncludePath>$(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>$(WxLibraryPath);$(LibraryPath)</LibraryPath>
<!-- Tell the linker to use the appropriate wx libraries --> </PropertyGroup>
<ItemDefinitionGroup>
<Link> <!-- Tell the linker to use the appropriate wx libraries -->
<AdditionalDependencies> <ItemDefinitionGroup>
$(WxLibBase).lib; <Link>
$(WxLibBase)_net.lib; <AdditionalDependencies>
$(WxLibBase)_xml.lib; wxbase29u$(WxLibDbgSuffix).lib;
$(WxLibMsw)_core.lib; wxbase29u$(WxLibDbgSuffix)_net.lib;
$(WxLibMsw)_adv.lib; wxbase29u$(WxLibDbgSuffix)_xml.lib;
$(WxLibMsw)_gl.lib; wxmsw29u$(WxLibDbgSuffix)_core.lib;
$(WxLibMsw)_stc.lib; wxmsw29u$(WxLibDbgSuffix)_adv.lib;
wxscintilla$(WxLibDbgSuffix).lib; wxmsw29u$(WxLibDbgSuffix)_gl.lib;
wxzlib$(WxLibDbgSuffix).lib; wxmsw29u$(WxLibDbgSuffix)_stc.lib;
wxexpat$(WxLibDbgSuffix).lib; wxscintilla$(WxLibDbgSuffix).lib;
wxregexu$(WxLibDbgSuffix).lib; wxzlib$(WxLibDbgSuffix).lib;
wxpng$(WxLibDbgSuffix).lib; wxexpat$(WxLibDbgSuffix).lib;
%(AdditionalDependencies) wxregexu$(WxLibDbgSuffix).lib;
</AdditionalDependencies> wxpng$(WxLibDbgSuffix).lib;
</Link> %(AdditionalDependencies)
</ItemDefinitionGroup> </AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project> </Project>