mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Build and/or link the non-header-only boost libraries

Browse source
This commit is contained in:
Thomas Goyne 2013-01-19 07:16:48 -08:00
parent 89a431a68b
commit 10e06ac3f9
11 changed files with 180 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aegisub.sln
View file

@ -68,6 +68,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "aegisub\build\lib
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "aegisub\build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "aegisub\build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "aegisub\build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -284,6 +286,14 @@ Global
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Debug-MinDep|x64.ActiveCfg = Debug|x64 {5B0E9978-E76F-4BBC-8194-228323F59B53}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|Win32.ActiveCfg = Release|Win32 {5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|Win32.ActiveCfg = Release|Win32
{5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|x64.ActiveCfg = Release|x64 {5B0E9978-E76F-4BBC-8194-228323F59B53}.Release|x64.ActiveCfg = Release|x64
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|Win32.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|Win32.Build.0 = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|x64.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|x64.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|Win32.ActiveCfg = Release|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|Win32.Build.0 = Release|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
aegisub/Makefile.inc.in
View file

@ -76,6 +76,7 @@ CPPFLAGS_WX = @WX_CPPFLAGS@
LIBS_WX = @WX_LIBS@ -lz LIBS_WX = @WX_LIBS@ -lz
CPPFLAGS_BOOST = @BOOST_CPPFLAGS@ CPPFLAGS_BOOST = @BOOST_CPPFLAGS@
LIBS_BOOST = @BOOST_FILESYSTEM_LDFLAGS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_REGEX_LDFLAGS@ @BOOST_REGEX_LIBS@ @BOOST_SYSTEM_LDFLAGS@ @BOOST_SYSTEM_LIBS@
CFLAGS_FFMS2 = @FFMS2_CFLAGS@ CFLAGS_FFMS2 = @FFMS2_CFLAGS@
CFLAGS_FFTW3 = @FFTW3_CFLAGS@ CFLAGS_FFTW3 = @FFTW3_CFLAGS@

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

@ -5,6 +5,7 @@
<ProjectGuid>{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}</ProjectGuid> <ProjectGuid>{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}</ProjectGuid>
<RootNamespace>Aegisub</RootNamespace> <RootNamespace>Aegisub</RootNamespace>
</PropertyGroup> </PropertyGroup>
<!-- Aegisub project configuration --> <!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration"> <PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>exe</AegisubProjectType> <AegisubProjectType>exe</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 -->
<PropertyGroup> <PropertyGroup>
<TargetName>aegisub$(AegisubPlatformSuffix)</TargetName> <TargetName>aegisub$(AegisubPlatformSuffix)</TargetName>
@ -25,6 +27,7 @@
<AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Update git_version.h --> <!-- Update git_version.h -->
<Target Name="UpdateVersion" BeforeTargets="ClCompile"> <Target Name="UpdateVersion" BeforeTargets="ClCompile">
<ExecShellScript <ExecShellScript
@ -33,8 +36,12 @@
Configuration="@(ExecShellScript)" Configuration="@(ExecShellScript)"
Arguments=".." /> Arguments=".." />
</Target> </Target>
<!-- Project References --> <!-- Project References -->
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\boost\boost.vcxproj">
<Project>{a649d828-a399-4d81-adef-94cfdba7847f}</Project>
</ProjectReference>
<ProjectReference Include="..\csrihelper\csrihelper.vcxproj"> <ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
<Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project> <Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project>
</ProjectReference> </ProjectReference>
@ -75,6 +82,7 @@
<Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project> <Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SrcDir)MatroskaParser.h" /> <ClInclude Include="$(SrcDir)MatroskaParser.h" />

48
aegisub/build/boost/boost.vcxproj Normal file
View file

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{A649D828-A399-4D81-ADEF-94CFDBA7847F}</ProjectGuid>
<RootNamespace>boost</RootNamespace>
</PropertyGroup>
<!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>lib</AegisubProjectType>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Source files -->
<ItemGroup>
<ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\cregex.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\c_regex_traits.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\fileiter.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\instances.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\posix_api.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\regex.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\regex_raw_buffer.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\regex_traits_defaults.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\static_mutex.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\usinstances.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\w32_regex_traits.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\wc_regex_traits.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\wide_posix_api.cpp" />
<ClCompile Include="$(BoostPath)\libs\regex\src\winstances.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\codecvt_error_category.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\operations.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\path.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\path_traits.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\portability.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\unique_path.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\utf8_codecvt_facet.cpp" />
<ClCompile Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.cpp" />
<ClCompile Include="$(BoostPath)\libs\system\src\error_code.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp" />
<ClInclude Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.hpp" />
<ClInclude Include="$(BoostPath)\libs\system\src\local_free_on_destruction.hpp" />
</ItemGroup>
</Project>

99
aegisub/build/boost/boost.vcxproj.filters Normal file
View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="regex">
<UniqueIdentifier>{e091980d-4374-41b8-aa61-1b07695e1b17}</UniqueIdentifier>
</Filter>
<Filter Include="system">
<UniqueIdentifier>{be9f03e9-74a3-4705-97ee-105a404d8a10}</UniqueIdentifier>
</Filter>
<Filter Include="filesystem">
<UniqueIdentifier>{98abe5b9-aca6-4145-ab6d-e472e24eb522}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(BoostPath)\libs\regex\src\c_regex_traits.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\cregex.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\fileiter.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\instances.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\posix_api.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\regex.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\regex_raw_buffer.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\regex_traits_defaults.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\static_mutex.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\usinstances.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\w32_regex_traits.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\wc_regex_traits.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\wide_posix_api.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\regex\src\winstances.cpp">
<Filter>regex</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\system\src\error_code.cpp">
<Filter>system</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\codecvt_error_category.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\operations.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\path.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\path_traits.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\portability.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\unique_path.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\utf8_codecvt_facet.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.cpp">
<Filter>filesystem</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp">
<Filter>regex</Filter>
</ClInclude>
<ClInclude Include="$(BoostPath)\libs\system\src\local_free_on_destruction.hpp">
<Filter>system</Filter>
</ClInclude>
<ClInclude Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.hpp">
<Filter>filesystem</Filter>
</ClInclude>
</ItemGroup>
</Project>

3
aegisub/build/libaegisub/libaegisub.vcxproj
View file

@ -4,6 +4,7 @@
<ProjectGuid>{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}</ProjectGuid> <ProjectGuid>{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}</ProjectGuid>
<RootNamespace>libaegisub</RootNamespace> <RootNamespace>libaegisub</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>
@ -22,6 +24,7 @@
<ForcedIncludeFiles>lagi_pre.h</ForcedIncludeFiles> <ForcedIncludeFiles>lagi_pre.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SrcDir)lagi_pre.h" /> <ClInclude Include="$(SrcDir)lagi_pre.h" />

6
aegisub/build/standard-settings.props
View file

@ -16,7 +16,11 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>
BOOST_ALL_NO_LIB;
WIN32;
_WINDOWS;
%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
$(AegisubSourceBase)src\msvc; $(AegisubSourceBase)src\msvc;
$(AegisubSourceBase)\include; $(AegisubSourceBase)\include;

3
aegisub/configure.ac
View file

@ -245,7 +245,10 @@ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version,
[AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.])], [AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.])],
[AC_MSG_FAILURE([Aegisub requires fontconfig >= fontconfig_required_version])]) [AC_MSG_FAILURE([Aegisub requires fontconfig >= fontconfig_required_version])])
libext=a
BOOST_REQUIRE([boost_required_version]) BOOST_REQUIRE([boost_required_version])
BOOST_FILESYSTEM
BOOST_REGEX
######## ########
## iconv ## iconv

1
aegisub/libaegisub/Makefile
View file

@ -3,6 +3,7 @@ include ../Makefile.inc
LIB = libaegisub.a LIB = libaegisub.a
CXXFLAGS += -Iinclude -I../src -I.. -DLAGI -fPIC -Wno-variadic-macros CXXFLAGS += -Iinclude -I../src -I.. -DLAGI -fPIC -Wno-variadic-macros
CPPFLAGS += $(CPPFLAGS_BOOST)
PRECOMPILED_HEADER_NAME = lagi_pre.h PRECOMPILED_HEADER_NAME = lagi_pre.h
lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS) lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)

2
aegisub/m4macros/boost.m4
View file

@ -403,7 +403,7 @@ dnl generated only once above (before we start the for loops).
LDFLAGS=$boost_save_LDFLAGS LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS LIBS=$boost_save_LIBS
if test x"$Boost_lib" = xyes; then if test x"$Boost_lib" = xyes; then
Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath" Boost_lib_LDFLAGS="-L$boost_ldpath"
Boost_lib_LDPATH="$boost_ldpath" Boost_lib_LDPATH="$boost_ldpath"
break 6 break 6
else else

2
aegisub/src/Makefile
View file

@ -14,7 +14,7 @@ LIBS := -L../libaegisub -laegisub $(LIBS)
LIBS += $(LIBS_CCMALLOC) $(LIBS_EFENCE) $(LIBS_GL) LIBS += $(LIBS_CCMALLOC) $(LIBS_EFENCE) $(LIBS_GL)
LIBS += $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) LIBS += $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE)
LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3) LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3)
LIBS += $(LIBS_UCHARDET) LIBS += $(LIBS_UCHARDET) $(LIBS_BOOST)
LDFLAGS += $(LDFLAGS_CCMALLOC) LDFLAGS += $(LDFLAGS_CCMALLOC)