Add a 64-bit build on appveyor
This commit is contained in:
parent
3dab0066bc
commit
50cc0aa31d
3 changed files with 22 additions and 2 deletions
|
|
@ -6,12 +6,14 @@ branches:
|
|||
|
||||
platform:
|
||||
- x86
|
||||
- x64
|
||||
|
||||
init:
|
||||
- git config --global core.autocrlf false
|
||||
|
||||
install:
|
||||
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
|
||||
- IF "%PLATFORM%" == "x86" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat")
|
||||
- IF "%PLATFORM%" == "x64" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat")
|
||||
- script\configure.cmd
|
||||
- script\fetch-fixtures.cmd
|
||||
|
||||
|
|
@ -21,4 +23,4 @@ test_script:
|
|||
build: off
|
||||
|
||||
cache:
|
||||
- test\fixtures\grammars
|
||||
- test\fixtures\grammars
|
||||
|
|
|
|||
|
|
@ -162,5 +162,13 @@
|
|||
'-Wno-unused-parameter'
|
||||
],
|
||||
},
|
||||
|
||||
# For 64-bit builds on appveyor, we need to explicitly tell gyp
|
||||
# to generate an x64 target in the MSVS project file.
|
||||
'conditions': [
|
||||
['"<!(echo %PLATFORM%)" == "x64"', {
|
||||
'msvs_configuration_platform': 'x64',
|
||||
}]
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
tests.gyp
10
tests.gyp
|
|
@ -21,6 +21,7 @@
|
|||
'test/helpers/stderr_logger.cc',
|
||||
],
|
||||
},
|
||||
|
||||
{
|
||||
'target_name': 'tests',
|
||||
'default_configuration': 'Test',
|
||||
|
|
@ -97,12 +98,21 @@
|
|||
|
||||
'target_defaults': {
|
||||
'configurations': {'Test': {}, 'Release': {}},
|
||||
|
||||
'cflags_cc': ['-std=c++14'],
|
||||
|
||||
'conditions': [
|
||||
['OS=="linux"', {
|
||||
'libraries': ['-ldl', '-lpthread'],
|
||||
}],
|
||||
|
||||
# For 64-bit builds on appveyor, we need to explicitly tell gyp
|
||||
# to generate an x64 target in the MSVS project file.
|
||||
['"<!(echo %PLATFORM%)" == "x64"', {
|
||||
'msvs_configuration_platform': 'x64',
|
||||
}]
|
||||
],
|
||||
|
||||
'xcode_settings': {
|
||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
|
||||
'ALWAYS_SEARCH_USER_PATHS': 'NO',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue