mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2025-01-27 12:37:01 +00:00
Always use our zlib project files, no matter the zlib version
This commit is contained in:
parent
fe37075966
commit
0d058312f1
@ -42,17 +42,6 @@ del bh2.bat
|
|||||||
md lib >NUL
|
md lib >NUL
|
||||||
md lib\debug >NUL
|
md lib\debug >NUL
|
||||||
if not exist "expat\expat.sln" devenv expat\expat.dsw
|
if not exist "expat\expat.sln" devenv expat\expat.dsw
|
||||||
if exist "zlib\projects\visualc6\zlib.sln" goto build
|
|
||||||
|
|
||||||
if exist zlib-1.2.3 goto zlib-fix
|
|
||||||
echo -------------
|
|
||||||
echo Zlib needs to be manually fixed. Convert everything,
|
|
||||||
echo then set Runtime Library under Release configuration to /MT.
|
|
||||||
echo Project properties, C++, Code Generation.
|
|
||||||
devenv zlib\projects\visualc6\zlib.dsw
|
|
||||||
goto build
|
|
||||||
|
|
||||||
:zlib-fix
|
|
||||||
copy /y mkvtoolnix\winbuild\zlib.* zlib\projects\visualc6\ >NUL
|
copy /y mkvtoolnix\winbuild\zlib.* zlib\projects\visualc6\ >NUL
|
||||||
|
|
||||||
:build
|
:build
|
||||||
@ -126,4 +115,4 @@ echo Please ensure that you're running this from the mkvtoolnix directory, as
|
|||||||
echo C:\...\mkvtoolnix>"winbuild\Build using VC8.bat"
|
echo C:\...\mkvtoolnix>"winbuild\Build using VC8.bat"
|
||||||
goto done
|
goto done
|
||||||
|
|
||||||
:done
|
:done
|
||||||
|
Loading…
Reference in New Issue
Block a user