diff --git a/contrib/coapp/buildall.bat b/contrib/coapp/buildall.bat new file mode 100644 index 0000000..e31a8e3 --- /dev/null +++ b/contrib/coapp/buildall.bat @@ -0,0 +1,51 @@ +@echo off +setlocal + +setlocal +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 +call :build x64 Release v120 || goto :eof +call :build x64 Debug v120 || goto :eof +endlocal + +setlocal +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 +call :build Win32 Release v120 || goto :eof +call :build Win32 Debug v120 || goto :eof +endlocal + +REM setlocal +REM call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64 +REM call :build x64 Release v110 || goto :eof +REM call :build x64 Debug v110 || goto :eof +REM endlocal + +REM setlocal +REM call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86 +REM call :build Win32 Release v110 || goto :eof +REM call :build Win32 Debug v110 || goto :eof +REM endlocal + +REM setlocal +REM call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 +REM call :build x64 Release v100 || goto :eof +REM call :build x64 Debug v100 || goto :eof +REM endlocal + +REM setlocal +REM call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +REM call :build Win32 Release v100 || goto :eof +REM call :build Win32 Debug v100 || goto :eof +REM endlocal + +goto :eof + +:build +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=cdecl .\zlib.sln || goto :eof +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=stdcall .\zlib.sln || goto :eof +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=cdecl .\zlib.sln || goto :eof +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=stdcall .\zlib.sln || goto :eof +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=cdecl .\zlib.sln || goto :eof +msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=stdcall .\zlib.sln || goto :eof +goto :eof + + diff --git a/contrib/coapp/version.inc b/contrib/coapp/version.inc index 90144f7..c9a0a82 100644 --- a/contrib/coapp/version.inc +++ b/contrib/coapp/version.inc @@ -1 +1 @@ -#define { package-version : 1.2.8.6; } +#define { package-version : 1.2.8.7; } diff --git a/contrib/coapp/zlib.autopkg b/contrib/coapp/zlib.autopkg index 4f398e9..063b545 100644 --- a/contrib/coapp/zlib.autopkg +++ b/contrib/coapp/zlib.autopkg @@ -64,16 +64,16 @@ nuget { "..\minizip\unzip.c", "..\minizip\zip.c", }; - ("v100,v110", "Win32,x64", "release,debug", "Dynamic", "cdecl,stdcall") => { + ("v100,v110,v120", "Win32,x64", "release,debug", "Dynamic", "cdecl,stdcall", "MultiByte") => { [${0},${1},${2},${3},${4}] { - lib: { .\output\${0}\${1}\${2}\${3}\${4}\*.lib }; - bin: { .\output\${0}\${1}\${2}\${3}\${4}\*.dll }; - symbols: { .\output\${0}\${1}\${2}\${3}\${4}\*.pdb }; + lib: { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.lib }; + bin: { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.dll }; + symbols: { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.pdb }; }; }; - ("v100,v110", "Win32,x64", "release,debug", "Static,ltcg", "cdecl,stdcall") => { + ("v100,v110,v120", "Win32,x64", "release,debug", "Static,ltcg", "cdecl,stdcall", "MultiByte") => { [${0},${1},${2},${3},${4}] { - lib: { .\output\${0}\${1}\${2}\${3}\${4}\*.lib }; + lib: { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.lib }; }; };