Skip to content
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

Jump to bottom

Enable building with Visual Studio 2014 #77

Merged
merged 5 commits into from
Nov 14, 2014
Merged

Enable building with Visual Studio 2014 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f061f3
expose msbuild_toolset option
Nov 14, 2014
1e3d51d
pull in [email protected] with --toolset support
Nov 14, 2014
6d911d8
support toolset option (will have no affect unless --toolset passed)
Nov 14, 2014
b44d793
fix common.gypi syntax
Nov 14, 2014
cc47d9f
fix compile with visual studio >= 2014
Nov 14, 2014
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
2 changes: 2 additions & 0 deletions common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"variables": {
"toolset%":'',
"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',''))\")"
},
"target_defaults": {
"default_configuration": "Release",
"msbuild_toolset":"<(toolset)",
"cflags_cc!": ["-fno-exceptions"],
"cflags!": ["-fno-exceptions"],
"defines": [
Expand Down
2 changes: 2 additions & 0 deletions deps/libgdal/arch/win/cpl_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#if defined(_MSC_VER) && (_MSC_VER < 1500)
# define vsnprintf _vsnprintf
#endif
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define snprintf _snprintf
#endif

#define HAVE_GETCWD 1
/* gmt_notunix.h from GMT project also redefines getcwd. See #3138 */
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"binary": {
"module_name": "gdal",
"module_path": "./lib/binding/",
"remote_path": "./{module_name}/v{version}",
"remote_path": "./{module_name}/v{version}/{toolset}/",
"host": "https://mapbox-node-binary.s3.amazonaws.com",
"package_name": "{node_abi}-{platform}-{arch}.tar.gz"
},
Expand All @@ -45,13 +45,13 @@
"install": "node-pre-gyp install --fallback-to-build"
},
"dependencies": {
"node-pre-gyp": "~0.5.17",
"node-pre-gyp": "~0.6.1",
"nan": "~1.3.0"
},
"devDependencies": {
"mocha": "~1.x",
"chai": "~1.9.1",
"aws-sdk": "~2.0.7"
"aws-sdk": "~2.0.25"
},
"bundledDependencies": [
"node-pre-gyp"
Expand Down