Skip to content

Commit

Permalink
Merge f53a2cc into 231a3b5
Browse files Browse the repository at this point in the history
  • Loading branch information
dcaravana committed Jan 8, 2019
2 parents 231a3b5 + f53a2cc commit 9dcf29d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,20 @@ node_js:
- "0.10"
- "0.12"
- "4.0"
os:
- linux
- osx
matrix:
include:
- os: linux
- os: osx
osx_image: xcode10
exclude:
- os: osx
node_js: "0.12"
after_script: istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
install:
- export CXX="g++-4.8" CXX="gcc-4.8"
- $CXX --version
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX=g++-4.8; fi
- npm install -g istanbul
- npm install
addons:
Expand Down
10 changes: 9 additions & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"variables": {
"prefers_libcpp":"<!(python -c \"import os;import platform;u=platform.uname();print((u[0] == 'Darwin' and int(u[2][0:2]) >= 13) and '-stdlib=libstdc++' not in os.environ.get('CXXFLAGS','') and '-mmacosx-version-min' not in os.environ.get('CXXFLAGS',''))\")"
},
"targets": [
{
"target_name": "mp4duration",
Expand All @@ -20,7 +23,12 @@
"GCC_ENABLE_CPP_EXCEPTIONS": "YES"
}
}
]
],
[ '"<(prefers_libcpp)"=="True"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET':'10.9'
}
}]
],
"include_dirs": [
"<!(node -e \"require('nan')\")"
Expand Down

0 comments on commit 9dcf29d

Please sign in to comment.