From f98c4df79ade952ba00a47a93e1b8e041d91af61 Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 6 Oct 2015 16:39:56 -0300 Subject: [PATCH] Rename SKIA_OPENGL_LIBRARY variable in src/she/CMakeLists.txt --- src/she/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt index f0595b9f8..fb45214ce 100644 --- a/src/she/CMakeLists.txt +++ b/src/she/CMakeLists.txt @@ -84,7 +84,7 @@ if(USE_SKIA_BACKEND) if(WIN32) find_library(SKIA_ETC1_LIBRARY libetc1 PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp") find_library(SKIA_LIBSKKTX_LIBRARY libSkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp") - find_library(SKIA_OPENGL32_LIBRARY opengl32) + find_library(SKIA_OPENGL_LIBRARY opengl32) find_library(SKIA_LIBEGL_LIBRARY libEGL.dll.lib PATH "${SKIA_BUILD_OUT_DIR}") if(SKIA_LIBEGL_LIBRARY) add_definitions(-DSK_ANGLE=1) @@ -92,6 +92,7 @@ if(USE_SKIA_BACKEND) else() find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}") find_library(SKIA_LIBSKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}") + find_library(SKIA_OPENGL_LIBRARY opengl) endif() find_path(SKIA_CONFIG_INCLUDE_DIR SkUserConfig.h HINTS "${SKIA_DIR}/include/config") @@ -114,7 +115,7 @@ if(USE_SKIA_BACKEND) set(SKIA_LIBRARIES ${SKIA_ETC1_LIBRARY} ${SKIA_LIBSKKTX_LIBRARY} - ${SKIA_OPENGL32_LIBRARY} + ${SKIA_OPENGL_LIBRARY} ${SKIA_LIBEGL_LIBRARY} ${SKIA_CORE_LIBRARY} ${SKIA_EFFECTS_LIBRARY}