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

Move submodules to aegisub/vendor

Browse source
This commit is contained in:
Thomas Goyne 2014-03-10 15:36:32 -07:00
parent c97e2031d5
commit bdff48f19b
23 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
.gitmodules vendored
View file

@ -1,56 +1,56 @@
[submodule "deps/fribidi"] [submodule "aegisub/vendor/fribidi"]
path = deps/fribidi path = aegisub/vendor/fribidi
url = git://anongit.freedesktop.org/fribidi/fribidi url = git://anongit.freedesktop.org/fribidi/fribidi
ignore = dirty ignore = dirty
[submodule "deps/freetype2"] [submodule "aegisub/vendor/freetype2"]
path = deps/freetype2 path = aegisub/vendor/freetype2
url = git://git.sv.nongnu.org/freetype/freetype2.git url = git://git.sv.nongnu.org/freetype/freetype2.git
ignore = dirty ignore = dirty
[submodule "deps/zlib"] [submodule "aegisub/vendor/zlib"]
path = deps/zlib path = aegisub/vendor/zlib
url = git://github.com/madler/zlib.git url = git://github.com/madler/zlib.git
ignore = dirty ignore = dirty
[submodule "deps/wxWidgets"] [submodule "aegisub/vendor/wxWidgets"]
path = deps/wxWidgets path = aegisub/vendor/wxWidgets
url = git://github.com/wxWidgets/wxWidgets.git url = git://github.com/wxWidgets/wxWidgets.git
ignore = dirty ignore = dirty
[submodule "deps/googletest"] [submodule "aegisub/vendor/googletest"]
path = deps/googletest path = aegisub/vendor/googletest
url = git://github.com/svn2github/googletest.git url = git://github.com/svn2github/googletest.git
ignore = dirty ignore = dirty
[submodule "deps/ffmpeg"] [submodule "aegisub/vendor/ffmpeg"]
path = deps/ffmpeg path = aegisub/vendor/ffmpeg
url = git://source.ffmpeg.org/ffmpeg.git url = git://source.ffmpeg.org/ffmpeg.git
ignore = dirty ignore = dirty
[submodule "deps/ffms2"] [submodule "aegisub/vendor/ffms2"]
path = deps/ffms2 path = aegisub/vendor/ffms2
url = git://github.com/FFMS/ffms2.git url = git://github.com/FFMS/ffms2.git
branch = master branch = master
ignore = dirty ignore = dirty
[submodule "deps/fontconfig"] [submodule "aegisub/vendor/fontconfig"]
path = deps/fontconfig path = aegisub/vendor/fontconfig
url = git://github.com/tgoyne/fontconfig.git url = git://github.com/tgoyne/fontconfig.git
branch = msvc branch = msvc
ignore = dirty ignore = dirty
[submodule "deps/libass"] [submodule "aegisub/vendor/libass"]
path = deps/libass path = aegisub/vendor/libass
url = git://github.com/libass/libass.git url = git://github.com/libass/libass.git
branch = master branch = master
[submodule "deps/icu"] [submodule "aegisub/vendor/icu"]
path = deps/icu path = aegisub/vendor/icu
url = git://github.com/sillsdev/icu4c.git url = git://github.com/sillsdev/icu4c.git
branch = trunk branch = trunk
ignore = dirty ignore = dirty
[submodule "deps/boost"] [submodule "aegisub/vendor/boost"]
path = deps/boost path = aegisub/vendor/boost
url = https://github.com/boostorg/boost.git url = https://github.com/boostorg/boost.git
ignore = dirty ignore = dirty
[submodule "deps/lua"] [submodule "aegisub/vendor/lua"]
path = deps/lua path = aegisub/vendor/lua
url = git://github.com/ittner/Lua-experimentation.git url = git://github.com/ittner/Lua-experimentation.git
branch = lua51 branch = lua51
ignore = dirty ignore = dirty
[submodule "deps/fftw"] [submodule "aegisub/vendor/fftw"]
path = deps/fftw path = aegisub/vendor/fftw
url = https://github.com/Aegisub/fftw3.git url = https://github.com/Aegisub/fftw3.git
ignore = dirty ignore = dirty

24
aegisub/build/DefaultConfiguration.props
View file

@ -50,18 +50,18 @@
<UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer> <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
<UpdateCheckerURL>/trunk</UpdateCheckerURL> <UpdateCheckerURL>/trunk</UpdateCheckerURL>
<BoostPath>..\..\..\deps\boost</BoostPath> <BoostPath>..\..\vendor\boost</BoostPath>
<FfmsSrcDir>..\..\..\deps\ffms2</FfmsSrcDir> <FfmsSrcDir>..\..\vendor\ffms2</FfmsSrcDir>
<FfmpegSrcDir>..\..\..\deps\ffmpeg</FfmpegSrcDir> <FfmpegSrcDir>..\..\vendor\ffmpeg</FfmpegSrcDir>
<FftwSrcDir>..\..\..\deps\fftw</FftwSrcDir> <FftwSrcDir>..\..\vendor\fftw</FftwSrcDir>
<Freetype2SrcDir>..\..\..\deps\freetype2</Freetype2SrcDir> <Freetype2SrcDir>..\..\vendor\freetype2</Freetype2SrcDir>
<FribidiSrcDir>..\..\..\deps\fribidi</FribidiSrcDir> <FribidiSrcDir>..\..\vendor\fribidi</FribidiSrcDir>
<FontconfigSrcDir>..\..\..\deps\fontconfig</FontconfigSrcDir> <FontconfigSrcDir>..\..\vendor\fontconfig</FontconfigSrcDir>
<GtestSrcDir>..\..\..\deps\googletest</GtestSrcDir> <GtestSrcDir>..\..\vendor\googletest</GtestSrcDir>
<IcuSrcDir>..\..\..\deps\icu\source</IcuSrcDir> <IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
<LibassSrcDir>..\..\..\deps\libass</LibassSrcDir> <LibassSrcDir>..\..\vendor\libass</LibassSrcDir>
<WxSrcDir>..\..\..\deps\wxWidgets</WxSrcDir> <WxSrcDir>..\..\vendor\wxWidgets</WxSrcDir>
<ZlibSrcDir>..\..\..\deps\zlib</ZlibSrcDir> <ZlibSrcDir>..\..\vendor\zlib</ZlibSrcDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(MsysBasePath)' == ''"> <PropertyGroup Condition="'$(MsysBasePath)' == ''">

4
aegisub/build/icu/icu.vcxproj
View file

@ -85,8 +85,8 @@
<!-- Includes Break Iterator and Collator data only --> <!-- Includes Break Iterator and Collator data only -->
<DownloadTgzFile <DownloadTgzFile
Url="http://www.aegisub.org/~plorkyeran/icudt52l.dat.tgz" Url="http://www.aegisub.org/~plorkyeran/icudt52l.dat.tgz"
Destination="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in" Destination="$(MSBuildThisFileDirectory)..\..\vendor\icu\source\data\in"
OutputFile="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in\icudt52l.dat" OutputFile="$(MSBuildThisFileDirectory)..\..\vendor\icu\source\data\in\icudt52l.dat"
Hash="b611a32e857ab4474e3c0118bd09b0958026fe1d" Hash="b611a32e857ab4474e3c0118bd09b0958026fe1d"
/> />

2
aegisub/build/lua51/lua51.vcxproj
View file

@ -8,7 +8,7 @@
<!-- Aegisub project configuration --> <!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration"> <PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>lib</AegisubProjectType> <AegisubProjectType>lib</AegisubProjectType>
<SrcDir>..\..\..\deps\lua\src\</SrcDir> <SrcDir>..\..\vendor\lua\src\</SrcDir>
</PropertyGroup> </PropertyGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" /> <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />

1
aegisub/vendor/boost vendored Submodule

@ -0,0 +1 @@
Subproject commit db6013d20a28dd0d96a8c21146e33f17788c4881

1
aegisub/vendor/ffmpeg vendored Submodule

@ -0,0 +1 @@
Subproject commit 52b6db848d41ee811b9368a3df8918f7310bed31

0
deps/ffms2 → aegisub/vendor/ffms2 vendored
View file

0
deps/fftw → aegisub/vendor/fftw vendored
View file

0
deps/fontconfig → aegisub/vendor/fontconfig vendored
View file

0
deps/freetype2 → aegisub/vendor/freetype2 vendored
View file

0
deps/fribidi → aegisub/vendor/fribidi vendored
View file

1
aegisub/vendor/googletest vendored Submodule

@ -0,0 +1 @@
Subproject commit cc0116f14aa8ad9ab76226d082a96b1005221816

0
deps/icu → aegisub/vendor/icu vendored
View file

1
aegisub/vendor/libass vendored Submodule

@ -0,0 +1 @@
Subproject commit 817bb3b1e192b94e0fc27ede617dbb2fe534d3ef

1
aegisub/vendor/lua vendored Submodule

@ -0,0 +1 @@
Subproject commit 4997ebeaee85a1193d40820f5695d2555a30c39f

1
aegisub/vendor/wxWidgets vendored Submodule

@ -0,0 +1 @@
Subproject commit de20880064f76e8742397cb4cc73db9d25edab50

0
deps/zlib → aegisub/vendor/zlib vendored
View file

1
deps/boost vendored

@ -1 +0,0 @@
Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35

1
deps/ffmpeg vendored

@ -1 +0,0 @@
Subproject commit 8dfd0e62f5d32db66ebbe3e13144ee5720bad585

1
deps/googletest vendored

@ -1 +0,0 @@
Subproject commit b3d0b4ea4ab877a355e79dd0de704577811fff0f

1
deps/libass vendored

@ -1 +0,0 @@
Subproject commit 98707694069b6f1808eef5e1d23bc63fb575e067

1
deps/lua vendored

@ -1 +0,0 @@
Subproject commit 49a7bfe8149a24ba550ab46c8e0b29f05e37b11a

1
deps/wxWidgets vendored

@ -1 +0,0 @@
Subproject commit 96430b3f3d40c483f49ae419babf6c2e5255ac0a