Merge branch 'refs/heads/windows-gyp-test' into 0.3.x

* refs/heads/windows-gyp-test:
  Removed use of pre-built GDAL.

appveyor.yml

@@ -25,8 +25,6 @@ install:
   - IF "%CM%" == "%CM:[publish binary]=%" (SET ENABLE_LOGGING=1)
   - ps: Write-Output '$env:Platform:' $env:Platform
   - ps: Write-Output '$env:nodejs_version' $env:nodejs_version
-  - ps: Start-FileDownload "https://mapnik.s3.amazonaws.com/dist/dev/libgdal_win_$env:Platform.7z"
-  - 7z x libgdal_win_%PLATFORM%.7z
   - ps: Update-NodeJsInstallation $env:nodejs_version $env:Platform
   - node --version
   - npm --version
@@ -38,8 +36,8 @@ install:
   - npm install node-gyp
   - npm install https://github.com/naturalatlas/mocha/archive/fix/333.tar.gz
   # build with/without logging depending on if we're pushing a binary
-  - IF NOT "%ENABLE_LOGGING%" == "1" (npm install --build-from-source --msvs_version=2013 --shared_gdal=c:/projects/node-gdal/libs/)
-  - IF "%ENABLE_LOGGING%" == "1" (npm install --build-from-source --msvs_version=2013 --shared_gdal=c:/projects/node-gdal/libs/ --enable-logging=true)
+  - IF NOT "%ENABLE_LOGGING%" == "1" (npm install --build-from-source --msvs_version=2013)
+  - IF "%ENABLE_LOGGING%" == "1" (npm install --build-from-source --msvs_version=2013 --enable-logging=true)
   - npm test || SET HAD_ERROR=1
   - IF "%ENABLE_LOGGING%" == "1" (appveyor PushArtifact test/artifacts/log.txt)
   - IF DEFINED HAD_ERROR (EXIT /B 1)

binding.gyp

@@ -78,7 +78,6 @@
 					"conditions": [
 						['OS == "win"', {
 							"libraries": [
-								'<!@(find <(shared_gdal) -name "*.lib")',
 								"-lsecur32.lib",
 								"-lws2_32.lib",
 								"-lodbccp32.lib",
@@ -127,18 +126,6 @@
 					],
 					"destination": "<(module_path)"
 				}
-			],
-			"conditions": [
-				["shared_gdal != 'false' and OS == 'win'", {
-					"copies": [
-						{
-							"files": [
-								"<(shared_gdal)/libexpat.dll"
-							],
-							"destination": "<(module_path)"
-						}
-					]
-				}]
 			]
 		}
 	]