From 7f061f3ee63bb4ec07086bd8f4b1715b2f69e406 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Nov 2014 18:55:49 -0800 Subject: [PATCH 1/5] expose msbuild_toolset option --- common.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.gypi b/common.gypi index 750c9f92..b4491921 100644 --- a/common.gypi +++ b/common.gypi @@ -1,9 +1,11 @@ { "variables": { + "toolset%":'', "prefers_libcpp": "= 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": [ From 1e3d51db8dc74f51aaf4dfa1cacf239a31190df0 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Nov 2014 19:04:50 -0800 Subject: [PATCH 2/5] pull in node-pre-gyp@0.6.1 with --toolset support --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf331dc2..5a3a0e95 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "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": { From 6d911d8e038c2ed7846f409e5861991622ae8813 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Nov 2014 19:06:37 -0800 Subject: [PATCH 3/5] support toolset option (will have no affect unless --toolset passed) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5a3a0e95..dea39fcc 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -51,7 +51,7 @@ "devDependencies": { "mocha": "~1.x", "chai": "~1.9.1", - "aws-sdk": "~2.0.7" + "aws-sdk": "~2.0.25" }, "bundledDependencies": [ "node-pre-gyp" From b44d793a5cb716225818822d1d1fbbe879805839 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Nov 2014 23:19:32 -0800 Subject: [PATCH 4/5] fix common.gypi syntax --- common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index b4491921..82879720 100644 --- a/common.gypi +++ b/common.gypi @@ -5,7 +5,7 @@ }, "target_defaults": { "default_configuration": "Release", - "msbuild_toolset':'<(toolset)", + "msbuild_toolset":"<(toolset)", "cflags_cc!": ["-fno-exceptions"], "cflags!": ["-fno-exceptions"], "defines": [ From cc47d9f243c368814a692b2e971d415e36fc69e2 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 13 Nov 2014 23:22:51 -0800 Subject: [PATCH 5/5] fix compile with visual studio >= 2014 --- deps/libgdal/arch/win/cpl_config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/libgdal/arch/win/cpl_config.h b/deps/libgdal/arch/win/cpl_config.h index cf46768b..4ceb149c 100644 --- a/deps/libgdal/arch/win/cpl_config.h +++ b/deps/libgdal/arch/win/cpl_config.h @@ -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 */