Skip to content

Adding support for v120 toolset. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stgates wants to merge 1 commit into
base: CoApp
Choose a base branch
from
Open

Adding support for v120 toolset. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions contrib/coapp/buildall.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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


2 changes: 1 addition & 1 deletion contrib/coapp/version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define { package-version : 1.2.8.6; }
#define { package-version : 1.2.8.7; }
12 changes: 6 additions & 6 deletions contrib/coapp/zlib.autopkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
};
};

Expand Down