From ceeded293214a34f878d50fe3a8ca4a02ba52aeb Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 13 Dec 2016 12:34:33 -0800 Subject: [PATCH] [core] Obtain shaders from gl-js monorepo --- cmake/shaders.cmake | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake index e7fc7e8ad..833ebec86 100644 --- a/cmake/shaders.cmake +++ b/cmake/shaders.cmake @@ -1,6 +1,6 @@ function(add_shader VAR name) set(shader_build_cmd ${NodeJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js) - set(shader_file_prefix ${CMAKE_SOURCE_DIR}/node_modules/mapbox-gl-shaders/src) + set(shader_file_prefix ${CMAKE_SOURCE_DIR}/node_modules/mapbox-gl/shaders) set(shader_source_prefix ${MBGL_GENERATED}/include/mbgl/shader) add_custom_command( diff --git a/package.json b/package.json index 266cb6106..5dde33f8a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "ejs": "^2.4.1", "express": "^4.11.1", "lodash": "^4.16.4", - "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#b51b85ffb8c512e228c36c5405293ce51d123519", + "mapbox-gl": "mapbox/mapbox-gl-js#ab836206d415ca3a74257a3066d11a54ab2838cb", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653", "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#66397c8ee0426537d25e8d4cfcac134ca21a021b", "mkdirp": "^0.5.1",