Skip to content

Commit

Permalink
Remove use of epoxy from Linux shell (flutter#8334)
Browse files Browse the repository at this point in the history
Simplifies the build and runtime requirements for the Linux shell.
Since the engine does GL extension lookup manually anway, an extension
loader library isn't necessary.
  • Loading branch information
stuartmorgan authored Mar 27, 2019
1 parent 4efc321 commit 6d8b836
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion build/install-build-deps-linux-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

set -e

sudo apt-get -y install libglfw3-dev libepoxy-dev libgtk-3-dev libx11-dev
sudo apt-get -y install libglfw3-dev libgtk-3-dev libx11-dev
1 change: 0 additions & 1 deletion shell/platform/glfw/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ source_set("flutter_glfw") {
libs = [ "GL" ]

configs += [
"$flutter_root/shell/platform/linux/config:epoxy",
"$flutter_root/shell/platform/linux/config:glfw3",
"$flutter_root/shell/platform/linux/config:gtk3",
"$flutter_root/shell/platform/linux/config:x11",
Expand Down
5 changes: 0 additions & 5 deletions shell/platform/glfw/flutter_glfw.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
#include <cstdlib>
#include <iostream>

#ifdef __linux__
// Epoxy must be included before any graphics-related code.
#include <epoxy/gl.h>
#endif

#include <GLFW/glfw3.h>

#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
Expand Down
4 changes: 0 additions & 4 deletions shell/platform/linux/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

import("//build/config/linux/pkg_config.gni")

pkg_config("epoxy") {
packages = [ "epoxy" ]
}

pkg_config("glfw3") {
packages = [ "glfw3" ]
}
Expand Down

0 comments on commit 6d8b836

Please sign in to comment.