4 files changed, 5 insertions, 7 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 6aea962eab5..0988b1c0ac4 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -43,9 +43,8 @@ else()
 endif()
 
 if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
-  add_definitions(${GL_DEFINITIONS})
-  list(APPEND INC_SYS ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
-  list(APPEND LIB ${CYCLES_GL_LIBRARIES} ${CYCLES_GLEW_LIBRARIES} ${SDL2_LIBRARIES})
+  list(APPEND INC_SYS ${Epoxy_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS})
+  list(APPEND LIB ${Epoxy_LIBRARIES} ${SDL2_LIBRARIES})
 endif()
 
 cycles_external_libraries_append(LIB)
diff --git a/intern/cycles/app/opengl/display_driver.cpp b/intern/cycles/app/opengl/display_driver.cpp
index 8b99f3b6feb..d9c72c07ae4 100644
--- a/intern/cycles/app/opengl/display_driver.cpp
+++ b/intern/cycles/app/opengl/display_driver.cpp
@@ -7,8 +7,8 @@
 #include "util/log.h"
 #include "util/string.h"
 
-#include <GL/glew.h>
 #include <SDL.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/app/opengl/shader.cpp b/intern/cycles/app/opengl/shader.cpp
index 9db9ea7fce9..4d22fc2b763 100644
--- a/intern/cycles/app/opengl/shader.cpp
+++ b/intern/cycles/app/opengl/shader.cpp
@@ -6,7 +6,7 @@
 #include "util/log.h"
 #include "util/string.h"
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/app/opengl/window.cpp b/intern/cycles/app/opengl/window.cpp
index 7351ae3eecd..f3352decd08 100644
--- a/intern/cycles/app/opengl/window.cpp
+++ b/intern/cycles/app/opengl/window.cpp
@@ -11,8 +11,8 @@
 #include "util/time.h"
 #include "util/version.h"
 
-#include <GL/glew.h>
 #include <SDL.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
@@ -294,7 +294,6 @@ void window_main_loop(const char *title,
   SDL_RaiseWindow(V.window);
 
   V.gl_context = SDL_GL_CreateContext(V.window);
-  glewInit();
   SDL_GL_MakeCurrent(V.window, nullptr);
 
   window_reshape(width, height);