Skip to content

[linux] Use pkg-config for libglfw #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2019
Merged

[linux] Use pkg-config for libglfw #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions build/linux/config/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@

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

pkg_config("gtk3") {
packages = [ "gtk+-3.0" ]
}

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

pkg_config("x11") {
packages = [ "x11" ]
pkg_config("glfw3") {
packages = [ "glfw3" ]
}

pkg_config("gtk3") {
packages = [ "gtk+-3.0" ]
}

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

pkg_config("x11") {
packages = [ "x11" ]
}
5 changes: 2 additions & 3 deletions example/linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ endif

# Build settings
CXX=g++ -std=c++14
CXXFLAGS=-Wall -Werror $(shell pkg-config --cflags jsoncpp)
CXXFLAGS=-Wall -Werror $(shell pkg-config --cflags jsoncpp glfw3)
CPPFLAGS=$(patsubst %,-I%,$(INCLUDE_DIRS))
ifdef USE_GN
CPPFLAGS+=-DUSE_FLATTENED_INCLUDES
endif
LDFLAGS=-L$(OUT_LIB_DIR) \
-lglfw \
$(shell pkg-config --libs jsoncpp) \
$(shell pkg-config --libs jsoncpp glfw3) \
-l$(FLUTTER_EMBEDDER_LIB_NAME) \
-l$(FLUTTER_ENGINE_LIB_NAME) \
$(patsubst %,-l$(PLUGIN_LIB_NAME_PREFIX)%,$(PLUGIN_NAMES)) \
Expand Down
2 changes: 1 addition & 1 deletion library/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ published_shared_library("flutter_embedder") {

if (is_linux) {
libs = [
"glfw",
"GL",
]

Expand All @@ -83,6 +82,7 @@ published_shared_library("flutter_embedder") {

configs += [
"//build/linux/config:epoxy",
"//build/linux/config:glfw3",
"//build/linux/config:gtk3",
"//build/linux/config:jsoncpp",
"//build/linux/config:x11",
Expand Down
6 changes: 3 additions & 3 deletions library/linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ CXXFLAGS= -Wall -Werror -shared -fPIC -fvisibility=hidden \
-I$(PROJECT_ROOT)/library/include \
-I$(FLUTTER_ENGINE_HEADER_DIR) \
-DFLUTTER_DESKTOP_EMBEDDING_IMPL \
$(shell pkg-config --cflags gtk+-3.0 epoxy x11 jsoncpp)
$(shell pkg-config --cflags gtk+-3.0 epoxy x11 jsoncpp glfw3)
LDFLAGS= -L$(CURDIR) \
$(shell pkg-config --libs gtk+-3.0 epoxy x11 jsoncpp) \
-lglfw -lGL -l$(FLUTTER_ENGINE_LIB_NAME) \
$(shell pkg-config --libs gtk+-3.0 epoxy x11 jsoncpp glfw3) \
-lGL -l$(FLUTTER_ENGINE_LIB_NAME) \
-Wl,-rpath=$(CURDIR)


Expand Down