Commit 21431691 by Dane Springmeyer

ensure both libsqlite3 and node-sqlite3 are compiled with same visual studio version

parent 35329a84
...@@ -40,7 +40,7 @@ install: ...@@ -40,7 +40,7 @@ install:
# install node version per visual studio toolset # install node version per visual studio toolset
- ps: Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe" - ps: Write-Output "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"
- if "%msvs_toolset%" == "12" powershell "Install-Product node $env:nodejs_version $env:Platform" - if "%msvs_toolset%" == "12" powershell "Install-Product node $env:nodejs_version $env:Platform"
- if "%msvs_toolset%" == "14" powershell 'Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe"' - if "%msvs_toolset%" == "14" powershell "Start-FileDownload 'https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/$env:Platform/node.exe'"
# upgrade node-gyp to support --msvs_version=2013 # upgrade node-gyp to support --msvs_version=2013
- npm install node-gyp - npm install node-gyp
- SET PATH=C:\Program Files (x86)\MSBuild\%msvs_toolset%.0\bin;%PATH% - SET PATH=C:\Program Files (x86)\MSBuild\%msvs_toolset%.0\bin;%PATH%
......
...@@ -2,12 +2,7 @@ ...@@ -2,12 +2,7 @@
"includes": [ "deps/common-sqlite.gypi" ], "includes": [ "deps/common-sqlite.gypi" ],
"variables": { "variables": {
"sqlite%":"internal", "sqlite%":"internal",
"sqlite_libname%":"sqlite3", "sqlite_libname%":"sqlite3"
"toolset%":'',
},
'target_defaults': {
'default_configuration': 'Release',
'msbuild_toolset':'<(toolset)'
}, },
"targets": [ "targets": [
{ {
......
{ {
'variables': { 'variables': {
'sqlite_version%':'3080701' 'sqlite_version%':'3080701',
"toolset%":'',
},
'target_defaults': {
'default_configuration': 'Release',
'msbuild_toolset':'<(toolset)'
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment