mirror of https://github.com/odrling/Aegisub
Use wx's vendored copy of zlib rather than having a second copy in a submodule
This commit is contained in:
parent
1651446e0f
commit
a0efd18f96
|
@ -2,10 +2,6 @@
|
||||||
path = vendor/freetype2
|
path = 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 "zlib"]
|
|
||||||
path = vendor/zlib
|
|
||||||
url = git://github.com/madler/zlib.git
|
|
||||||
ignore = dirty
|
|
||||||
[submodule "wxWidgets"]
|
[submodule "wxWidgets"]
|
||||||
path = vendor/wxWidgets
|
path = vendor/wxWidgets
|
||||||
url = git://github.com/wxWidgets/wxWidgets.git
|
url = git://github.com/wxWidgets/wxWidgets.git
|
||||||
|
|
|
@ -61,6 +61,6 @@
|
||||||
<IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
|
<IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
|
||||||
<LibassSrcDir>..\..\vendor\libass</LibassSrcDir>
|
<LibassSrcDir>..\..\vendor\libass</LibassSrcDir>
|
||||||
<WxSrcDir>..\..\vendor\wxWidgets</WxSrcDir>
|
<WxSrcDir>..\..\vendor\wxWidgets</WxSrcDir>
|
||||||
<ZlibSrcDir>..\..\vendor\zlib</ZlibSrcDir>
|
<ZlibSrcDir>..\..\vendor\wxWidgets\src\zlib</ZlibSrcDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -24,9 +24,33 @@
|
||||||
<InstallHeaderTo Include="$(MSBuildThisFileDirectory)\zconf.h" />
|
<InstallHeaderTo Include="$(MSBuildThisFileDirectory)\zconf.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="$(ZlibSrcDir)\*.c" />
|
<ClCompile Include="$(ZlibSrcDir)\adler32.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\compress.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\crc32.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\deflate.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\gzclose.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\gzlib.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\gzread.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\gzwrite.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\infback.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\inffast.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\inflate.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\inftrees.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\trees.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\uncompr.c" />
|
||||||
|
<ClCompile Include="$(ZlibSrcDir)\zutil.c" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="$(ZlibSrcDir)\*.h" />
|
<ClInclude Include="$(ZlibSrcDir)\crc32.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\deflate.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\gzguts.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\inffast.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\inffixed.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\inflate.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\inftrees.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\trees.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\zconf.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\zlib.h" />
|
||||||
|
<ClInclude Include="$(ZlibSrcDir)\zutil.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 50893291621658f355bc5b4d450a8d06a563053d
|
|
Loading…
Reference in New Issue